/ BCI NET 2 / BCI NET 2.iso / archives / programming / source / a2.0bemacs-src.lha / Emacs-19.25 / lisp / emerge.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 68 61 |piled by| kwzh@ha|
|00000020| 6c 2e 67 6e 75 2e 61 69 | 2e 6d 69 74 2e 65 64 75 |l.gnu.ai|.mit.edu|
|00000030| 20 6f 6e 20 46 72 69 20 | 41 70 72 20 31 35 20 32 | on Fri |Apr 15 2|
|00000040| 32 3a 33 39 3a 35 35 20 | 31 39 39 34 0a 3b 3b 3b |2:39:55 |1994.;;;|
|00000050| 20 66 72 6f 6d 20 66 69 | 6c 65 20 2f 61 6d 64 2f | from fi|le /amd/|
|00000060| 63 68 75 72 63 68 79 2f | 68 6f 6d 65 2f 67 64 2f |churchy/|home/gd/|
|00000070| 67 6e 75 2f 65 6d 61 63 | 73 2f 31 39 2e 30 2f 6c |gnu/emac|s/19.0/l|
|00000080| 69 73 70 2f 65 6d 65 72 | 67 65 2e 65 6c 0a 3b 3b |isp/emer|ge.el.;;|
|00000090| 3b 20 65 6d 61 63 73 20 | 76 65 72 73 69 6f 6e 20 |; emacs |version |
|000000a0| 31 39 2e 32 32 2e 39 30 | 2e 31 2e 0a 3b 3b 3b 20 |19.22.90|.1..;;; |
|000000b0| 62 79 74 65 63 6f 6d 70 | 20 76 65 72 73 69 6f 6e |bytecomp| version|
|000000c0| 20 46 53 46 20 32 2e 31 | 30 0a 3b 3b 3b 20 6f 70 | FSF 2.1|0.;;; op|
|000000d0| 74 69 6d 69 7a 61 74 69 | 6f 6e 20 69 73 20 6f 6e |timizati|on is on|
|000000e0| 2e 0a 3b 3b 3b 20 74 68 | 69 73 20 66 69 6c 65 20 |..;;; th|is file |
|000000f0| 75 73 65 73 20 6f 70 63 | 6f 64 65 73 20 77 68 69 |uses opc|odes whi|
|00000100| 63 68 20 64 6f 20 6e 6f | 74 20 65 78 69 73 74 20 |ch do no|t exist |
|00000110| 69 6e 20 45 6d 61 63 73 | 20 31 38 2e 0a 0a 28 69 |in Emacs| 18...(i|
|00000120| 66 20 28 61 6e 64 20 28 | 62 6f 75 6e 64 70 20 27 |f (and (|boundp '|
|00000130| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 29 0a 09 |emacs-ve|rsion)..|
|00000140| 20 28 6f 72 20 28 61 6e | 64 20 28 62 6f 75 6e 64 | (or (an|d (bound|
|00000150| 70 20 27 65 70 6f 63 68 | 3a 3a 76 65 72 73 69 6f |p 'epoch|::versio|
|00000160| 6e 29 20 65 70 6f 63 68 | 3a 3a 76 65 72 73 69 6f |n) epoch|::versio|
|00000170| 6e 29 0a 09 20 20 20 20 | 20 28 73 74 72 69 6e 67 |n)..    | (string|
|00000180| 2d 6c 65 73 73 70 20 65 | 6d 61 63 73 2d 76 65 72 |-lessp e|macs-ver|
|00000190| 73 69 6f 6e 20 22 31 39 | 22 29 29 29 0a 20 20 20 |sion "19|"))).   |
|000001a0| 20 28 65 72 72 6f 72 20 | 22 60 2f 61 6d 64 2f 63 | (error |"`/amd/c|
|000001b0| 68 75 72 63 68 79 2f 68 | 6f 6d 65 2f 67 64 2f 67 |hurchy/h|ome/gd/g|
|000001c0| 6e 75 2f 65 6d 61 63 73 | 2f 31 39 2e 30 2f 6c 69 |nu/emacs|/19.0/li|
|000001d0| 73 70 2f 65 6d 65 72 67 | 65 2e 65 6c 27 20 77 61 |sp/emerg|e.el' wa|
|000001e0| 73 20 63 6f 6d 70 69 6c | 65 64 20 66 6f 72 20 45 |s compil|ed for E|
|000001f0| 6d 61 63 73 20 31 39 22 | 29 29 0a 0a 28 62 79 74 |macs 19"|))..(byt|
|00000200| 65 2d 63 6f 64 65 20 22 | c0 c1 21 84 5c 6e 00 c2 |e-code "|..!.\n..|
|00000210| c3 21 11 c1 89 4a 4d 88 | c4 09 c5 c6 23 88 c4 09 |.!...JM.|....#...|
|00000220| c7 c8 23 88 c4 09 c9 ca | 23 88 c4 09 cb cc 23 88 |..#.....|#.....#.|
|00000230| c4 09 cd ce 23 88 c4 09 | cf d0 23 88 c4 09 d1 d2 |....#...|..#.....|
|00000240| 23 87 22 20 5b 62 6f 75 | 6e 64 70 20 6d 65 6e 75 |#." [bou|ndp menu|
|00000250| 2d 62 61 72 2d 65 6d 65 | 72 67 65 2d 6d 65 6e 75 |-bar-eme|rge-menu|
|00000260| 20 6d 61 6b 65 2d 73 70 | 61 72 73 65 2d 6b 65 79 | make-sp|arse-key|
|00000270| 6d 61 70 20 22 45 6d 65 | 72 67 65 22 20 64 65 66 |map "Eme|rge" def|
|00000280| 69 6e 65 2d 6b 65 79 20 | 5b 65 6d 65 72 67 65 2d |ine-key |[emerge-|
|00000290| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|000002a0| 73 5d 20 28 22 4d 65 72 | 67 65 20 44 69 72 65 63 |s] ("Mer|ge Direc|
|000002b0| 74 6f 72 69 65 73 20 2e | 2e 2e 22 20 2e 20 65 6d |tories .|.." . em|
|000002c0| 65 72 67 65 2d 6d 65 72 | 67 65 2d 64 69 72 65 63 |erge-mer|ge-direc|
|000002d0| 74 6f 72 69 65 73 29 20 | 5b 65 6d 65 72 67 65 2d |tories) |[emerge-|
|000002e0| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|000002f0| 6e 63 65 73 74 6f 72 5d | 20 28 22 52 65 76 69 73 |ncestor]| ("Revis|
|00000300| 69 6f 6e 73 20 77 69 74 | 68 20 41 6e 63 65 73 74 |ions wit|h Ancest|
|00000310| 6f 72 20 2e 2e 2e 22 20 | 2e 20 65 6d 65 72 67 65 |or ..." |. emerge|
|00000320| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00000330| 61 6e 63 65 73 74 6f 72 | 29 20 5b 65 6d 65 72 67 |ancestor|) [emerg|
|00000340| 65 2d 72 65 76 69 73 69 | 6f 6e 73 5d 20 28 22 52 |e-revisi|ons] ("R|
|00000350| 65 76 69 73 69 6f 6e 73 | 20 2e 2e 2e 22 20 2e 20 |evisions| ..." . |
|00000360| 65 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |emerge-r|evisions|
|00000370| 29 20 5b 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |) [emerg|e-files-|
|00000380| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 5d 20 28 |with-anc|estor] (|
|00000390| 22 46 69 6c 65 73 20 77 | 69 74 68 20 41 6e 63 65 |"Files w|ith Ance|
|000003a0| 73 74 6f 72 20 2e 2e 2e | 22 20 2e 20 65 6d 65 72 |stor ...|" . emer|
|000003b0| 67 65 2d 66 69 6c 65 73 | 2d 77 69 74 68 2d 61 6e |ge-files|-with-an|
|000003c0| 63 65 73 74 6f 72 29 20 | 5b 65 6d 65 72 67 65 2d |cestor) |[emerge-|
|000003d0| 66 69 6c 65 73 5d 20 28 | 22 46 69 6c 65 73 20 2e |files] (|"Files .|
|000003e0| 2e 2e 22 20 2e 20 65 6d | 65 72 67 65 2d 66 69 6c |.." . em|erge-fil|
|000003f0| 65 73 29 20 5b 65 6d 65 | 72 67 65 2d 62 75 66 66 |es) [eme|rge-buff|
|00000400| 65 72 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ers-with|-ancesto|
|00000410| 72 5d 20 28 22 42 75 66 | 66 65 72 73 20 77 69 74 |r] ("Buf|fers wit|
|00000420| 68 20 41 6e 63 65 73 74 | 6f 72 20 2e 2e 2e 22 20 |h Ancest|or ..." |
|00000430| 2e 20 65 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |. emerge|-buffers|
|00000440| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00000450| 5b 65 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 5d |[emerge-|buffers]|
|00000460| 20 28 22 42 75 66 66 65 | 72 73 20 2e 2e 2e 22 20 | ("Buffe|rs ..." |
|00000470| 2e 20 65 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |. emerge|-buffers|
|00000480| 29 5d 20 34 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |)] 4).(d|efalias |
|00000490| 27 65 6d 65 72 67 65 2d | 65 76 61 6c 2d 69 6e 2d |'emerge-|eval-in-|
|000004a0| 62 75 66 66 65 72 20 27 | 28 6d 61 63 72 6f 20 2e |buffer '|(macro .|
|000004b0| 20 23 5b 28 62 75 66 66 | 65 72 20 26 72 65 73 74 | #[(buff|er &rest|
|000004c0| 20 66 6f 72 6d 73 29 20 | 22 c0 c1 c2 c3 c4 0d 44 | forms) |"......D|
|000004d0| 0e 06 42 42 c7 42 42 45 | 87 22 20 5b 6c 65 74 20 |..BB.BBE|." [let |
|000004e0| 28 28 53 74 61 72 74 42 | 75 66 66 65 72 20 28 63 |((StartB|uffer (c|
|000004f0| 75 72 72 65 6e 74 2d 62 | 75 66 66 65 72 29 29 29 |urrent-b|uffer)))|
|00000500| 20 75 6e 77 69 6e 64 2d | 70 72 6f 74 65 63 74 20 | unwind-|protect |
|00000510| 70 72 6f 67 6e 20 73 65 | 74 2d 62 75 66 66 65 72 |progn se|t-buffer|
|00000520| 20 62 75 66 66 65 72 20 | 66 6f 72 6d 73 20 28 28 | buffer |forms ((|
|00000530| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00000540| 42 75 66 66 65 72 29 29 | 5d 20 36 20 22 5c 0a 4d |Buffer))|] 6 "\.M|
|00000550| 61 63 72 6f 20 74 6f 20 | 73 77 69 74 63 68 20 74 |acro to |switch t|
|00000560| 6f 20 42 55 46 46 45 52 | 2c 20 65 76 61 6c 75 61 |o BUFFER|, evalua|
|00000570| 74 65 20 46 4f 52 4d 53 | 2c 20 72 65 74 75 72 6e |te FORMS|, return|
|00000580| 73 20 74 6f 20 6f 72 69 | 67 69 6e 61 6c 20 62 75 |s to ori|ginal bu|
|00000590| 66 66 65 72 2e 0a 44 69 | 66 66 65 72 73 20 66 72 |ffer..Di|ffers fr|
|000005a0| 6f 6d 20 60 73 61 76 65 | 2d 65 78 63 75 72 73 69 |om `save|-excursi|
|000005b0| 6f 6e 27 20 69 6e 20 74 | 68 61 74 20 69 74 20 64 |on' in t|hat it d|
|000005c0| 6f 65 73 6e 27 74 20 73 | 61 76 65 20 74 68 65 20 |oesn't s|ave the |
|000005d0| 70 6f 69 6e 74 20 61 6e | 64 20 6d 61 72 6b 2e 22 |point an|d mark."|
|000005e0| 5d 29 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |])).(def|alias 'e|
|000005f0| 6d 65 72 67 65 2d 64 65 | 66 76 61 72 2d 6c 6f 63 |merge-de|fvar-loc|
|00000600| 61 6c 20 27 28 6d 61 63 | 72 6f 20 2e 20 23 5b 28 |al '(mac|ro . #[(|
|00000610| 76 61 72 20 76 61 6c 75 | 65 20 64 6f 63 29 20 22 |var valu|e doc) "|
|00000620| c0 c1 5c 6e 0b 5c 66 46 | c5 c6 5c 6e 44 44 c7 c6 |..\n.\fF|..\nDD..|
|00000630| 5c 6e 44 c8 42 42 46 87 | 22 20 5b 70 72 6f 67 6e |\nD.BBF.|" [progn|
|00000640| 20 64 65 66 76 61 72 20 | 76 61 72 20 76 61 6c 75 | defvar |var valu|
|00000650| 65 20 64 6f 63 20 6d 61 | 6b 65 2d 76 61 72 69 61 |e doc ma|ke-varia|
|00000660| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00000670| 20 71 75 6f 74 65 20 70 | 75 74 20 28 28 71 75 6f | quote p|ut ((quo|
|00000680| 74 65 20 70 72 65 73 65 | 72 76 65 64 29 20 74 29 |te prese|rved) t)|
|00000690| 5d 20 36 20 22 5c 0a 44 | 65 66 69 6e 65 73 20 53 |] 6 "\.D|efines S|
|000006a0| 59 4d 42 4f 4c 20 61 73 | 20 61 6e 20 61 64 76 65 |YMBOL as| an adve|
|000006b0| 72 74 69 73 65 64 20 76 | 61 72 69 61 62 6c 65 2e |rtised v|ariable.|
|000006c0| 20 20 0a 50 65 72 66 6f | 72 6d 73 20 61 20 64 65 |  .Perfo|rms a de|
|000006d0| 66 76 61 72 2c 20 74 68 | 65 6e 20 65 78 65 63 75 |fvar, th|en execu|
|000006e0| 74 65 73 20 60 6d 61 6b | 65 2d 76 61 72 69 61 62 |tes `mak|e-variab|
|000006f0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 27 |le-buffe|r-local'|
|00000700| 20 6f 6e 0a 74 68 65 20 | 76 61 72 69 61 62 6c 65 | on.the |variable|
|00000710| 2e 20 20 41 6c 73 6f 20 | 73 65 74 73 20 74 68 65 |.  Also |sets the|
|00000720| 20 60 70 72 65 73 65 72 | 76 65 64 27 20 70 72 6f | `preser|ved' pro|
|00000730| 70 65 72 74 79 2c 20 73 | 6f 20 74 68 61 74 0a 60 |perty, s|o that.`|
|00000740| 6b 69 6c 6c 2d 61 6c 6c | 2d 6c 6f 63 61 6c 2d 76 |kill-all|-local-v|
|00000750| 61 72 69 61 62 6c 65 73 | 27 20 28 63 61 6c 6c 65 |ariables|' (calle|
|00000760| 64 20 62 79 20 6d 61 6a | 6f 72 2d 6d 6f 64 65 20 |d by maj|or-mode |
|00000770| 73 65 74 74 69 6e 67 20 | 63 6f 6d 6d 61 6e 64 73 |setting |commands|
|00000780| 29 20 0a 77 6f 6e 27 74 | 20 64 65 73 74 72 6f 79 |) .won't| destroy|
|00000790| 20 45 6d 65 72 67 65 20 | 63 6f 6e 74 72 6f 6c 20 | Emerge |control |
|000007a0| 76 61 72 69 61 62 6c 65 | 73 2e 22 5d 29 29 0a 28 |variable|s."])).(|
|000007b0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 84 08 |byte-cod|e "..!..|
|000007c0| 00 c2 11 c3 5c 66 9e 84 | 13 00 c5 09 5c 66 5c 22 |....\f..|....\f\"|
|000007d0| 14 c0 87 22 20 5b 62 6f | 75 6e 64 70 20 65 6d 65 |..." [bo|undp eme|
|000007e0| 72 67 65 2d 6d 69 6e 6f | 72 2d 6d 6f 64 65 73 2d |rge-mino|r-modes-|
|000007f0| 6c 69 73 74 20 28 28 65 | 6d 65 72 67 65 2d 6d 6f |list ((e|merge-mo|
|00000800| 64 65 20 22 20 45 6d 65 | 72 67 65 22 29 20 28 65 |de " Eme|rge") (e|
|00000810| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6d 6f 64 65 20 |merge-fa|st-mode |
|00000820| 22 20 46 22 29 20 28 65 | 6d 65 72 67 65 2d 65 64 |" F") (e|merge-ed|
|00000830| 69 74 2d 6d 6f 64 65 20 | 22 20 45 22 29 20 28 65 |it-mode |" E") (e|
|00000840| 6d 65 72 67 65 2d 61 75 | 74 6f 2d 61 64 76 61 6e |merge-au|to-advan|
|00000850| 63 65 20 22 20 41 22 29 | 20 28 65 6d 65 72 67 65 |ce " A")| (emerge|
|00000860| 2d 73 6b 69 70 2d 70 72 | 65 66 65 72 73 20 22 20 |-skip-pr|efers " |
|00000870| 53 22 29 29 20 65 6d 65 | 72 67 65 2d 6d 6f 64 65 |S")) eme|rge-mode|
|00000880| 20 6d 69 6e 6f 72 2d 6d | 6f 64 65 2d 61 6c 69 73 | minor-m|ode-alis|
|00000890| 74 20 61 70 70 65 6e 64 | 5d 20 33 29 0a 28 64 65 |t append|] 3).(de|
|000008a0| 66 75 6e 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |fun emer|ge-mode |
|000008b0| 6e 69 6c 20 22 5c 0a 45 | 6d 65 72 67 65 20 6d 6f |nil "\.E|merge mo|
|000008c0| 64 65 20 69 73 20 75 73 | 65 64 20 62 79 20 74 68 |de is us|ed by th|
|000008d0| 65 20 45 6d 65 72 67 65 | 20 66 69 6c 65 2d 6d 65 |e Emerge| file-me|
|000008e0| 72 67 69 6e 67 20 70 61 | 63 6b 61 67 65 2e 0a 49 |rging pa|ckage..I|
|000008f0| 74 20 69 73 20 65 6e 74 | 65 72 65 64 20 6f 6e 6c |t is ent|ered onl|
|00000900| 79 20 74 68 72 6f 75 67 | 68 20 6f 6e 65 20 6f 66 |y throug|h one of|
|00000910| 20 74 68 65 20 66 75 6e | 63 74 69 6f 6e 73 3a 0a | the fun|ctions:.|
|00000920| 09 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 27 0a |.`emerge|-files'.|
|00000930| 09 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |.`emerge|-files-w|
|00000940| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 27 0a 09 60 |ith-ance|stor'..`|
|00000950| 65 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 27 0a |emerge-b|uffers'.|
|00000960| 09 60 65 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |.`emerge|-buffers|
|00000970| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 27 0a |-with-an|cestor'.|
|00000980| 09 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 63 |.`emerge|-files-c|
|00000990| 6f 6d 6d 61 6e 64 27 0a | 09 60 65 6d 65 72 67 65 |ommand'.|.`emerge|
|000009a0| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|000009b0| 73 74 6f 72 2d 63 6f 6d | 6d 61 6e 64 27 0a 09 60 |stor-com|mand'..`|
|000009c0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 72 65 6d |emerge-f|iles-rem|
|000009d0| 6f 74 65 27 0a 09 60 65 | 6d 65 72 67 65 2d 66 69 |ote'..`e|merge-fi|
|000009e0| 6c 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |les-with|-ancesto|
|000009f0| 72 2d 72 65 6d 6f 74 65 | 27 0a 0a 43 6f 6d 6d 61 |r-remote|'..Comma|
|00000a00| 6e 64 73 3a 0a 5c 5c 7b | 65 6d 65 72 67 65 2d 62 |nds:.\\{|emerge-b|
|00000a10| 61 73 69 63 2d 6b 65 79 | 6d 61 70 7d 0a 43 6f 6d |asic-key|map}.Com|
|00000a20| 6d 61 6e 64 73 20 6d 75 | 73 74 20 62 65 20 70 72 |mands mu|st be pr|
|00000a30| 65 66 69 78 65 64 20 62 | 79 20 5c 5c 3c 65 6d 65 |efixed b|y \\<eme|
|00000a40| 72 67 65 2d 66 61 73 74 | 2d 6b 65 79 6d 61 70 3e |rge-fast|-keymap>|
|00000a50| 5c 5c 5b 65 6d 65 72 67 | 65 2d 62 61 73 69 63 2d |\\[emerg|e-basic-|
|00000a60| 6b 65 79 6d 61 70 5d 20 | 69 6e 20 60 65 64 69 74 |keymap] |in `edit|
|00000a70| 27 20 6d 6f 64 65 2c 0a | 62 75 74 20 63 61 6e 20 |' mode,.|but can |
|00000a80| 62 65 20 69 6e 76 6f 6b | 65 64 20 64 69 72 65 63 |be invok|ed direc|
|00000a90| 74 6c 79 20 69 6e 20 60 | 66 61 73 74 27 20 6d 6f |tly in `|fast' mo|
|00000aa0| 64 65 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |de.").(d|efvar em|
|00000ab0| 65 72 67 65 2d 76 65 72 | 73 69 6f 6e 20 22 35 66 |erge-ver|sion "5f|
|00000ac0| 73 66 22 20 22 5c 0a 54 | 68 65 20 76 65 72 73 69 |sf" "\.T|he versi|
|00000ad0| 6f 6e 20 6f 66 20 45 6d | 65 72 67 65 2e 22 29 0a |on of Em|erge.").|
|00000ae0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00000af0| 65 2d 76 65 72 73 69 6f | 6e 20 23 5b 6e 69 6c 20 |e-versio|n #[nil |
|00000b00| 22 74 83 5c 6e 00 c0 c1 | c2 20 5c 22 87 5c 6e 87 |"t.\n...|. \".\n.|
|00000b10| 22 20 5b 6d 65 73 73 61 | 67 65 20 22 45 6d 65 72 |" [messa|ge "Emer|
|00000b20| 67 65 20 76 65 72 73 69 | 6f 6e 20 25 73 22 20 65 |ge versi|on %s" e|
|00000b30| 6d 65 72 67 65 2d 76 65 | 72 73 69 6f 6e 5d 20 33 |merge-ve|rsion] 3|
|00000b40| 20 22 5c 0a 52 65 74 75 | 72 6e 20 73 74 72 69 6e | "\.Retu|rn strin|
|00000b50| 67 20 64 65 73 63 72 69 | 62 69 6e 67 20 74 68 65 |g descri|bing the|
|00000b60| 20 76 65 72 73 69 6f 6e | 20 6f 66 20 45 6d 65 72 | version| of Emer|
|00000b70| 67 65 2e 0a 57 68 65 6e | 20 63 61 6c 6c 65 64 20 |ge..When| called |
|00000b80| 69 6e 74 65 72 61 63 74 | 69 76 65 6c 79 2c 20 64 |interact|ively, d|
|00000b90| 69 73 70 6c 61 79 73 20 | 74 68 65 20 76 65 72 73 |isplays |the vers|
|00000ba0| 69 6f 6e 2e 22 20 6e 69 | 6c 5d 29 0a 28 64 65 66 |ion." ni|l]).(def|
|00000bb0| 76 61 72 20 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |var emer|ge-diff-|
|00000bc0| 70 72 6f 67 72 61 6d 20 | 22 64 69 66 66 22 20 22 |program |"diff" "|
|00000bd0| 5c 0a 2a 4e 61 6d 65 20 | 6f 66 20 74 68 65 20 70 |\.*Name |of the p|
|00000be0| 72 6f 67 72 61 6d 20 77 | 68 69 63 68 20 63 6f 6d |rogram w|hich com|
|00000bf0| 70 61 72 65 73 20 74 77 | 6f 20 66 69 6c 65 73 2e |pares tw|o files.|
|00000c00| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00000c10| 65 2d 64 69 66 66 33 2d | 70 72 6f 67 72 61 6d 20 |e-diff3-|program |
|00000c20| 22 64 69 66 66 33 22 20 | 22 5c 0a 2a 4e 61 6d 65 |"diff3" |"\.*Name|
|00000c30| 20 6f 66 20 74 68 65 20 | 70 72 6f 67 72 61 6d 20 | of the |program |
|00000c40| 77 68 69 63 68 20 63 6f | 6d 70 61 72 65 73 20 74 |which co|mpares t|
|00000c50| 68 72 65 65 20 66 69 6c | 65 73 2e 0a 49 74 73 20 |hree fil|es..Its |
|00000c60| 61 72 67 75 6d 65 6e 74 | 73 20 61 72 65 20 74 68 |argument|s are th|
|00000c70| 65 20 61 6e 63 65 73 74 | 6f 72 20 66 69 6c 65 20 |e ancest|or file |
|00000c80| 61 6e 64 20 74 68 65 20 | 74 77 6f 20 76 61 72 69 |and the |two vari|
|00000c90| 61 6e 74 20 66 69 6c 65 | 73 2e 22 29 0a 28 64 65 |ant file|s.").(de|
|00000ca0| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |fvar eme|rge-diff|
|00000cb0| 2d 6f 70 74 69 6f 6e 73 | 20 22 22 20 22 5c 0a 2a |-options| "" "\.*|
|00000cc0| 4f 70 74 69 6f 6e 73 20 | 74 6f 20 70 61 73 73 20 |Options |to pass |
|00000cd0| 74 6f 20 60 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |to `emer|ge-diff-|
|00000ce0| 70 72 6f 67 72 61 6d 27 | 20 61 6e 64 20 60 65 6d |program'| and `em|
|00000cf0| 65 72 67 65 2d 64 69 66 | 66 33 2d 70 72 6f 67 72 |erge-dif|f3-progr|
|00000d00| 61 6d 27 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |am'.").(|defvar e|
|00000d10| 6d 65 72 67 65 2d 6d 61 | 74 63 68 2d 64 69 66 66 |merge-ma|tch-diff|
|00000d20| 2d 6c 69 6e 65 20 28 62 | 79 74 65 2d 63 6f 64 65 |-line (b|yte-code|
|00000d30| 20 22 c0 19 c2 09 c3 09 | c4 b0 05 29 87 22 20 5b | "......|...)." [|
|00000d40| 22 5c 5c 28 5b 30 2d 39 | 5d 2b 5c 5c 29 5c 5c 28 |"\\([0-9|]+\\)\\(|
|00000d50| 5c 5c 7c 2c 5c 5c 28 5b | 30 2d 39 5d 2b 5c 5c 29 |\\|,\\([|0-9]+\\)|
|00000d60| 5c 5c 29 22 20 78 20 22 | 5e 22 20 22 5c 5c 28 5b |\\)" x "|^" "\\([|
|00000d70| 61 63 64 5d 5c 5c 29 22 | 20 22 24 22 5d 20 35 29 |acd]\\)"| "$"] 5)|
|00000d80| 20 22 5c 0a 2a 50 61 74 | 74 65 72 6e 20 74 6f 20 | "\.*Pat|tern to |
|00000d90| 6d 61 74 63 68 20 6c 69 | 6e 65 73 20 70 72 6f 64 |match li|nes prod|
|00000da0| 75 63 65 64 20 62 79 20 | 64 69 66 66 20 74 68 61 |uced by |diff tha|
|00000db0| 74 20 64 65 73 63 72 69 | 62 65 20 64 69 66 66 65 |t descri|be diffe|
|00000dc0| 72 65 6e 63 65 73 2e 0a | 54 68 69 73 20 69 73 20 |rences..|This is |
|00000dd0| 61 73 20 6f 70 70 6f 73 | 65 64 20 74 6f 20 6c 69 |as oppos|ed to li|
|00000de0| 6e 65 73 20 66 72 6f 6d | 20 74 68 65 20 73 6f 75 |nes from| the sou|
|00000df0| 72 63 65 20 66 69 6c 65 | 73 2e 22 29 0a 28 64 65 |rce file|s.").(de|
|00000e00| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |fvar eme|rge-diff|
|00000e10| 2d 6f 6b 2d 6c 69 6e 65 | 73 2d 72 65 67 65 78 70 |-ok-line|s-regexp|
|00000e20| 20 22 5e 5c 5c 28 5b 30 | 2d 39 2c 5d 2b 5b 61 63 | "^\\([0|-9,]+[ac|
|00000e30| 64 5d 5b 30 2d 39 2c 5d | 2b 24 5c 5c 7c 5b 3c 3e |d][0-9,]|+$\\|[<>|
|00000e40| 5d 20 5c 5c 7c 2d 2d 2d | 5c 5c 29 22 20 22 5c 0a |] \\|---|\\)" "\.|
|00000e50| 2a 52 65 67 65 78 70 20 | 74 68 61 74 20 6d 61 74 |*Regexp |that mat|
|00000e60| 63 68 65 73 20 6e 6f 72 | 6d 61 6c 20 6f 75 74 70 |ches nor|mal outp|
|00000e70| 75 74 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 60 65 |ut lines| from `e|
|00000e80| 6d 65 72 67 65 2d 64 69 | 66 66 2d 70 72 6f 67 72 |merge-di|ff-progr|
|00000e90| 61 6d 27 2e 0a 4c 69 6e | 65 73 20 74 68 61 74 20 |am'..Lin|es that |
|00000ea0| 64 6f 20 6e 6f 74 20 6d | 61 74 63 68 20 61 72 65 |do not m|atch are|
|00000eb0| 20 61 73 73 75 6d 65 64 | 20 74 6f 20 62 65 20 65 | assumed| to be e|
|00000ec0| 72 72 6f 72 20 6d 65 73 | 73 61 67 65 73 2e 22 29 |rror mes|sages.")|
|00000ed0| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00000ee0| 64 69 66 66 33 2d 6f 6b | 2d 6c 69 6e 65 73 2d 72 |diff3-ok|-lines-r|
|00000ef0| 65 67 65 78 70 20 22 5e | 5c 5c 28 5b 31 2d 33 5d |egexp "^|\\([1-3]|
|00000f00| 3a 5c 5c 7c 3d 3d 3d 3d | 5c 5c 7c 20 20 5c 5c 29 |:\\|====|\\|  \\)|
|00000f10| 22 20 22 5c 0a 2a 52 65 | 67 65 78 70 20 74 68 61 |" "\.*Re|gexp tha|
|00000f20| 74 20 6d 61 74 63 68 65 | 73 20 6e 6f 72 6d 61 6c |t matche|s normal|
|00000f30| 20 6f 75 74 70 75 74 20 | 6c 69 6e 65 73 20 66 72 | output |lines fr|
|00000f40| 6f 6d 20 60 65 6d 65 72 | 67 65 2d 64 69 66 66 33 |om `emer|ge-diff3|
|00000f50| 2d 70 72 6f 67 72 61 6d | 27 2e 0a 4c 69 6e 65 73 |-program|'..Lines|
|00000f60| 20 74 68 61 74 20 64 6f | 20 6e 6f 74 20 6d 61 74 | that do| not mat|
|00000f70| 63 68 20 61 72 65 20 61 | 73 73 75 6d 65 64 20 74 |ch are a|ssumed t|
|00000f80| 6f 20 62 65 20 65 72 72 | 6f 72 20 6d 65 73 73 61 |o be err|or messa|
|00000f90| 67 65 73 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |ges.").(|defvar e|
|00000fa0| 6d 65 72 67 65 2d 72 63 | 73 2d 63 69 2d 70 72 6f |merge-rc|s-ci-pro|
|00000fb0| 67 72 61 6d 20 22 63 69 | 22 20 22 5c 0a 2a 4e 61 |gram "ci|" "\.*Na|
|00000fc0| 6d 65 20 6f 66 20 74 68 | 65 20 70 72 6f 67 72 61 |me of th|e progra|
|00000fd0| 6d 20 74 68 61 74 20 63 | 68 65 63 6b 73 20 69 6e |m that c|hecks in|
|00000fe0| 20 52 43 53 20 72 65 76 | 69 73 69 6f 6e 73 2e 22 | RCS rev|isions."|
|00000ff0| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00001000| 2d 72 63 73 2d 63 6f 2d | 70 72 6f 67 72 61 6d 20 |-rcs-co-|program |
|00001010| 22 63 6f 22 20 22 5c 0a | 2a 4e 61 6d 65 20 6f 66 |"co" "\.|*Name of|
|00001020| 20 74 68 65 20 70 72 6f | 67 72 61 6d 20 74 68 61 | the pro|gram tha|
|00001030| 74 20 63 68 65 63 6b 73 | 20 6f 75 74 20 52 43 53 |t checks| out RCS|
|00001040| 20 72 65 76 69 73 69 6f | 6e 73 2e 22 29 0a 28 64 | revisio|ns.").(d|
|00001050| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 70 72 6f |efvar em|erge-pro|
|00001060| 63 65 73 73 2d 6c 6f 63 | 61 6c 2d 76 61 72 69 61 |cess-loc|al-varia|
|00001070| 62 6c 65 73 20 6e 69 6c | 20 22 5c 0a 2a 4e 6f 6e |bles nil| "\.*Non|
|00001080| 2d 6e 69 6c 20 69 66 20 | 45 6d 65 72 67 65 20 73 |-nil if |Emerge s|
|00001090| 68 6f 75 6c 64 20 70 72 | 6f 63 65 73 73 20 6c 6f |hould pr|ocess lo|
|000010a0| 63 61 6c 2d 76 61 72 69 | 61 62 6c 65 73 20 6c 69 |cal-vari|ables li|
|000010b0| 73 74 73 20 69 6e 20 6d | 65 72 67 65 20 62 75 66 |sts in m|erge buf|
|000010c0| 66 65 72 73 2e 0a 28 59 | 6f 75 20 63 61 6e 20 65 |fers..(Y|ou can e|
|000010d0| 78 70 6c 69 63 69 74 6c | 79 20 72 65 71 75 65 73 |xplicitl|y reques|
|000010e0| 74 20 70 72 6f 63 65 73 | 73 69 6e 67 20 74 68 65 |t proces|sing the|
|000010f0| 20 6c 6f 63 61 6c 2d 76 | 61 72 69 61 62 6c 65 73 | local-v|ariables|
|00001100| 0a 62 79 20 65 78 65 63 | 75 74 69 6e 67 20 60 28 |.by exec|uting `(|
|00001110| 68 61 63 6b 2d 6c 6f 63 | 61 6c 2d 76 61 72 69 61 |hack-loc|al-varia|
|00001120| 62 6c 65 73 29 27 2e 29 | 22 29 0a 28 64 65 66 76 |bles)'.)|").(defv|
|00001130| 61 72 20 65 6d 65 72 67 | 65 2d 65 78 65 63 75 74 |ar emerg|e-execut|
|00001140| 65 2d 6c 69 6e 65 2d 64 | 65 6c 65 74 69 6f 6e 73 |e-line-d|eletions|
|00001150| 20 6e 69 6c 20 22 5c 0a | 2a 49 66 20 6e 6f 6e 2d | nil "\.|*If non-|
|00001160| 6e 69 6c 3a 20 60 65 6d | 65 72 67 65 2d 65 78 65 |nil: `em|erge-exe|
|00001170| 63 75 74 65 2d 6c 69 6e | 65 27 20 6d 61 6b 65 73 |cute-lin|e' makes|
|00001180| 20 6e 6f 20 6f 75 74 70 | 75 74 20 69 66 20 61 6e | no outp|ut if an|
|00001190| 20 69 6e 70 75 74 20 77 | 61 73 20 64 65 6c 65 74 | input w|as delet|
|000011a0| 65 64 2e 0a 49 74 20 63 | 6f 6e 63 6c 75 64 65 73 |ed..It c|oncludes|
|000011b0| 20 74 68 61 74 20 61 6e | 20 69 6e 70 75 74 20 76 | that an| input v|
|000011c0| 65 72 73 69 6f 6e 20 68 | 61 73 20 62 65 65 6e 20 |ersion h|as been |
|000011d0| 64 65 6c 65 74 65 64 20 | 77 68 65 6e 20 61 6e 20 |deleted |when an |
|000011e0| 61 6e 63 65 73 74 6f 72 | 20 65 6e 74 72 79 0a 69 |ancestor| entry.i|
|000011f0| 73 20 70 72 65 73 65 6e | 74 2c 20 6f 6e 6c 79 20 |s presen|t, only |
|00001200| 6f 6e 65 20 41 20 6f 72 | 20 42 20 65 6e 74 72 79 |one A or| B entry|
|00001210| 20 69 73 20 70 72 65 73 | 65 6e 74 2c 20 61 6e 64 | is pres|ent, and|
|00001220| 20 61 6e 20 6f 75 74 70 | 75 74 20 65 6e 74 72 79 | an outp|ut entry|
|00001230| 20 69 73 20 70 72 65 73 | 65 6e 74 2e 0a 49 66 20 | is pres|ent..If |
|00001240| 6e 69 6c 3a 20 49 6e 20 | 73 75 63 68 20 63 69 72 |nil: In |such cir|
|00001250| 63 75 6d 73 74 61 6e 63 | 65 73 2c 20 74 68 65 20 |cumstanc|es, the |
|00001260| 41 20 6f 72 20 42 20 66 | 69 6c 65 20 74 68 61 74 |A or B f|ile that|
|00001270| 20 69 73 20 70 72 65 73 | 65 6e 74 20 77 69 6c 6c | is pres|ent will|
|00001280| 20 62 65 0a 63 6f 70 69 | 65 64 20 74 6f 20 74 68 | be.copi|ed to th|
|00001290| 65 20 64 65 73 69 67 6e | 61 74 65 64 20 6f 75 74 |e design|ated out|
|000012a0| 70 75 74 20 66 69 6c 65 | 2e 22 29 0a 28 64 65 66 |put file|.").(def|
|000012b0| 76 61 72 20 65 6d 65 72 | 67 65 2d 62 65 66 6f 72 |var emer|ge-befor|
|000012c0| 65 2d 66 6c 61 67 20 22 | 76 76 76 76 76 76 76 76 |e-flag "|vvvvvvvv|
|000012d0| 76 76 76 76 76 76 76 76 | 76 76 76 76 5c 6e 22 20 |vvvvvvvv|vvvv\n" |
|000012e0| 22 5c 0a 2a 46 6c 61 67 | 20 70 6c 61 63 65 64 20 |"\.*Flag| placed |
|000012f0| 61 62 6f 76 65 20 74 68 | 65 20 68 69 67 68 6c 69 |above th|e highli|
|00001300| 67 68 74 65 64 20 62 6c | 6f 63 6b 20 6f 66 20 63 |ghted bl|ock of c|
|00001310| 6f 64 65 2e 20 20 4d 75 | 73 74 20 65 6e 64 20 77 |ode.  Mu|st end w|
|00001320| 69 74 68 20 6e 65 77 6c | 69 6e 65 2e 0a 4d 75 73 |ith newl|ine..Mus|
|00001330| 74 20 62 65 20 73 65 74 | 20 62 65 66 6f 72 65 20 |t be set| before |
|00001340| 45 6d 65 72 67 65 20 69 | 73 20 6c 6f 61 64 65 64 |Emerge i|s loaded|
|00001350| 2c 20 6f 72 20 20 65 6d | 65 72 67 65 2d 6e 65 77 |, or  em|erge-new|
|00001360| 2d 66 6c 61 67 73 20 20 | 6d 75 73 74 20 62 65 20 |-flags  |must be |
|00001370| 72 75 6e 0a 61 66 74 65 | 72 20 73 65 74 74 69 6e |run.afte|r settin|
|00001380| 67 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |g.").(de|fvar eme|
|00001390| 72 67 65 2d 61 66 74 65 | 72 2d 66 6c 61 67 20 22 |rge-afte|r-flag "|
|000013a0| 5e 5e 5e 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5e 5e |^^^^^^^^|^^^^^^^^|
|000013b0| 5e 5e 5e 5e 5c 6e 22 20 | 22 5c 0a 2a 46 6c 61 67 |^^^^\n" |"\.*Flag|
|000013c0| 20 70 6c 61 63 65 64 20 | 62 65 6c 6f 77 20 74 68 | placed |below th|
|000013d0| 65 20 68 69 67 68 6c 69 | 67 68 74 65 64 20 62 6c |e highli|ghted bl|
|000013e0| 6f 63 6b 20 6f 66 20 63 | 6f 64 65 2e 20 20 4d 75 |ock of c|ode.  Mu|
|000013f0| 73 74 20 65 6e 64 20 77 | 69 74 68 20 6e 65 77 6c |st end w|ith newl|
|00001400| 69 6e 65 2e 0a 4d 75 73 | 74 20 62 65 20 73 65 74 |ine..Mus|t be set|
|00001410| 20 62 65 66 6f 72 65 20 | 45 6d 65 72 67 65 20 69 | before |Emerge i|
|00001420| 73 20 6c 6f 61 64 65 64 | 2c 20 6f 72 20 20 65 6d |s loaded|, or  em|
|00001430| 65 72 67 65 2d 6e 65 77 | 2d 66 6c 61 67 73 20 20 |erge-new|-flags  |
|00001440| 6d 75 73 74 20 62 65 20 | 72 75 6e 0a 61 66 74 65 |must be |run.afte|
|00001450| 72 20 73 65 74 74 69 6e | 67 2e 22 29 0a 28 64 65 |r settin|g.").(de|
|00001460| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 73 74 61 72 |fvar eme|rge-star|
|00001470| 74 75 70 2d 68 6f 6f 6b | 20 6e 69 6c 20 22 5c 0a |tup-hook| nil "\.|
|00001480| 2a 48 6f 6f 6b 20 74 6f | 20 72 75 6e 20 69 6e 20 |*Hook to| run in |
|00001490| 74 68 65 20 6d 65 72 67 | 65 20 62 75 66 66 65 72 |the merg|e buffer|
|000014a0| 20 61 66 74 65 72 20 74 | 68 65 20 6d 65 72 67 65 | after t|he merge|
|000014b0| 20 68 61 73 20 62 65 65 | 6e 20 73 65 74 20 75 70 | has bee|n set up|
|000014c0| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|000014d0| 67 65 2d 73 65 6c 65 63 | 74 2d 68 6f 6f 6b 20 6e |ge-selec|t-hook n|
|000014e0| 69 6c 20 22 5c 0a 2a 48 | 6f 6f 6b 20 74 6f 20 72 |il "\.*H|ook to r|
|000014f0| 75 6e 20 61 66 74 65 72 | 20 61 20 64 69 66 66 65 |un after| a diffe|
|00001500| 72 65 6e 63 65 20 68 61 | 73 20 62 65 65 6e 20 73 |rence ha|s been s|
|00001510| 65 6c 65 63 74 65 64 2e | 0a 54 68 65 20 76 61 72 |elected.|.The var|
|00001520| 69 61 62 6c 65 20 60 6e | 27 20 68 6f 6c 64 73 20 |iable `n|' holds |
|00001530| 74 68 65 20 28 69 6e 74 | 65 72 6e 61 6c 29 20 6e |the (int|ernal) n|
|00001540| 75 6d 62 65 72 20 6f 66 | 20 74 68 65 20 64 69 66 |umber of| the dif|
|00001550| 66 65 72 65 6e 63 65 2e | 22 29 0a 28 64 65 66 76 |ference.|").(defv|
|00001560| 61 72 20 65 6d 65 72 67 | 65 2d 75 6e 73 65 6c 65 |ar emerg|e-unsele|
|00001570| 63 74 2d 68 6f 6f 6b 20 | 6e 69 6c 20 22 5c 0a 2a |ct-hook |nil "\.*|
|00001580| 48 6f 6f 6b 20 74 6f 20 | 72 75 6e 20 61 66 74 65 |Hook to |run afte|
|00001590| 72 20 61 20 64 69 66 66 | 65 72 65 6e 63 65 20 68 |r a diff|erence h|
|000015a0| 61 73 20 62 65 65 6e 20 | 75 6e 73 65 6c 65 63 74 |as been |unselect|
|000015b0| 65 64 2e 0a 54 68 65 20 | 76 61 72 69 61 62 6c 65 |ed..The |variable|
|000015c0| 20 60 6e 27 20 68 6f 6c | 64 73 20 74 68 65 20 28 | `n' hol|ds the (|
|000015d0| 69 6e 74 65 72 6e 61 6c | 29 20 6e 75 6d 62 65 72 |internal|) number|
|000015e0| 20 6f 66 20 74 68 65 20 | 64 69 66 66 65 72 65 6e | of the |differen|
|000015f0| 63 65 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |ce.").(d|efvar em|
|00001600| 65 72 67 65 2d 64 65 66 | 61 75 6c 74 2d 6c 61 73 |erge-def|ault-las|
|00001610| 74 2d 64 69 72 65 63 74 | 6f 72 69 65 73 20 6e 69 |t-direct|ories ni|
|00001620| 6c 20 22 5c 0a 2a 49 66 | 20 6e 69 6c 2c 20 64 65 |l "\.*If| nil, de|
|00001630| 66 61 75 6c 74 20 64 69 | 72 20 66 6f 72 20 66 69 |fault di|r for fi|
|00001640| 6c 65 6e 61 6d 65 73 20 | 69 6e 20 65 6d 65 72 67 |lenames |in emerg|
|00001650| 65 20 69 73 20 60 64 65 | 66 61 75 6c 74 2d 64 69 |e is `de|fault-di|
|00001660| 72 65 63 74 6f 72 79 27 | 2e 0a 49 66 20 6e 6f 6e |rectory'|..If non|
|00001670| 2d 6e 69 6c 2c 20 66 69 | 6c 65 6e 61 6d 65 73 20 |-nil, fi|lenames |
|00001680| 63 6f 6d 70 6c 65 74 65 | 20 69 6e 20 74 68 65 20 |complete| in the |
|00001690| 64 69 72 65 63 74 6f 72 | 79 20 6f 66 20 74 68 65 |director|y of the|
|000016a0| 20 6c 61 73 74 20 61 72 | 67 75 6d 65 6e 74 20 6f | last ar|gument o|
|000016b0| 66 20 74 68 65 0a 73 61 | 6d 65 20 74 79 70 65 20 |f the.sa|me type |
|000016c0| 74 6f 20 61 6e 20 60 65 | 6d 65 72 67 65 2d 66 69 |to an `e|merge-fi|
|000016d0| 6c 65 73 2e 2e 2e 27 20 | 63 6f 6d 6d 61 6e 64 2e |les...' |command.|
|000016e0| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|000016f0| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 41 20 6e 69 6c |e-last-d|ir-A nil|
|00001700| 20 22 5c 0a 4c 61 73 74 | 20 64 69 72 65 63 74 6f | "\.Last| directo|
|00001710| 72 79 20 66 6f 72 20 74 | 68 65 20 66 69 72 73 74 |ry for t|he first|
|00001720| 20 66 69 6c 65 20 6f 66 | 20 61 6e 20 60 65 6d 65 | file of| an `eme|
|00001730| 72 67 65 2d 66 69 6c 65 | 73 2e 2e 2e 27 20 63 6f |rge-file|s...' co|
|00001740| 6d 6d 61 6e 64 2e 22 29 | 0a 28 64 65 66 76 61 72 |mmand.")|.(defvar|
|00001750| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|00001760| 2d 42 20 6e 69 6c 20 22 | 5c 0a 4c 61 73 74 20 64 |-B nil "|\.Last d|
|00001770| 69 72 65 63 74 6f 72 79 | 20 66 6f 72 20 74 68 65 |irectory| for the|
|00001780| 20 73 65 63 6f 6e 64 20 | 66 69 6c 65 20 6f 66 20 | second |file of |
|00001790| 61 6e 20 60 65 6d 65 72 | 67 65 2d 66 69 6c 65 73 |an `emer|ge-files|
|000017a0| 2e 2e 2e 27 20 63 6f 6d | 6d 61 6e 64 2e 22 29 0a |...' com|mand.").|
|000017b0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 6c |(defvar |emerge-l|
|000017c0| 61 73 74 2d 64 69 72 2d | 61 6e 63 65 73 74 6f 72 |ast-dir-|ancestor|
|000017d0| 20 6e 69 6c 20 22 5c 0a | 4c 61 73 74 20 64 69 72 | nil "\.|Last dir|
|000017e0| 65 63 74 6f 72 79 20 66 | 6f 72 20 74 68 65 20 61 |ectory f|or the a|
|000017f0| 6e 63 65 73 74 6f 72 20 | 66 69 6c 65 20 6f 66 20 |ncestor |file of |
|00001800| 61 6e 20 60 65 6d 65 72 | 67 65 2d 66 69 6c 65 73 |an `emer|ge-files|
|00001810| 2e 2e 2e 27 20 63 6f 6d | 6d 61 6e 64 2e 22 29 0a |...' com|mand.").|
|00001820| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 6c |(defvar |emerge-l|
|00001830| 61 73 74 2d 64 69 72 2d | 6f 75 74 70 75 74 20 6e |ast-dir-|output n|
|00001840| 69 6c 20 22 5c 0a 4c 61 | 73 74 20 64 69 72 65 63 |il "\.La|st direc|
|00001850| 74 6f 72 79 20 66 6f 72 | 20 74 68 65 20 6f 75 74 |tory for| the out|
|00001860| 70 75 74 20 66 69 6c 65 | 20 6f 66 20 61 6e 20 60 |put file| of an `|
|00001870| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2e 2e 2e 27 |emerge-f|iles...'|
|00001880| 20 63 6f 6d 6d 61 6e 64 | 2e 22 29 0a 28 64 65 66 | command|.").(def|
|00001890| 76 61 72 20 65 6d 65 72 | 67 65 2d 6c 61 73 74 2d |var emer|ge-last-|
|000018a0| 72 65 76 69 73 69 6f 6e | 2d 41 20 6e 69 6c 20 22 |revision|-A nil "|
|000018b0| 5c 0a 4c 61 73 74 20 52 | 43 53 20 72 65 76 69 73 |\.Last R|CS revis|
|000018c0| 69 6f 6e 20 75 73 65 64 | 20 66 6f 72 20 66 69 72 |ion used| for fir|
|000018d0| 73 74 20 66 69 6c 65 20 | 6f 66 20 61 6e 20 60 65 |st file |of an `e|
|000018e0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2e |merge-re|visions.|
|000018f0| 2e 2e 27 20 63 6f 6d 6d | 61 6e 64 2e 22 29 0a 28 |..' comm|and.").(|
|00001900| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6c 61 |defvar e|merge-la|
|00001910| 73 74 2d 72 65 76 69 73 | 69 6f 6e 2d 42 20 6e 69 |st-revis|ion-B ni|
|00001920| 6c 20 22 5c 0a 4c 61 73 | 74 20 52 43 53 20 72 65 |l "\.Las|t RCS re|
|00001930| 76 69 73 69 6f 6e 20 75 | 73 65 64 20 66 6f 72 20 |vision u|sed for |
|00001940| 73 65 63 6f 6e 64 20 66 | 69 6c 65 20 6f 66 20 61 |second f|ile of a|
|00001950| 6e 20 60 65 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |n `emerg|e-revisi|
|00001960| 6f 6e 73 2e 2e 2e 27 20 | 63 6f 6d 6d 61 6e 64 2e |ons...' |command.|
|00001970| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00001980| 65 2d 6c 61 73 74 2d 72 | 65 76 69 73 69 6f 6e 2d |e-last-r|evision-|
|00001990| 61 6e 63 65 73 74 6f 72 | 20 6e 69 6c 20 22 5c 0a |ancestor| nil "\.|
|000019a0| 4c 61 73 74 20 52 43 53 | 20 72 65 76 69 73 69 6f |Last RCS| revisio|
|000019b0| 6e 20 75 73 65 64 20 66 | 6f 72 20 61 6e 63 65 73 |n used f|or ances|
|000019c0| 74 6f 72 20 66 69 6c 65 | 20 6f 66 20 61 6e 20 60 |tor file| of an `|
|000019d0| 65 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |emerge-r|evisions|
|000019e0| 2e 2e 2e 27 20 63 6f 6d | 6d 61 6e 64 2e 22 29 0a |...' com|mand.").|
|000019f0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00001a00| 65 2d 6e 65 77 2d 66 6c | 61 67 73 20 23 5b 6e 69 |e-new-fl|ags #[ni|
|00001a10| 6c 20 22 08 47 11 c2 08 | c3 5c 22 14 c5 08 21 16 |l ".G...|.\"...!.|
|00001a20| 06 0e 07 47 16 08 c2 0e | 07 c3 5c 22 16 09 c5 0e |...G....|..\"....|
|00001a30| 07 21 89 16 5c 6e 87 22 | 20 5b 65 6d 65 72 67 65 |.!..\n."| [emerge|
|00001a40| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 20 65 6d 65 |-before-|flag eme|
|00001a50| 72 67 65 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2d |rge-befo|re-flag-|
|00001a60| 6c 65 6e 67 74 68 20 65 | 6d 65 72 67 65 2d 63 6f |length e|merge-co|
|00001a70| 75 6e 74 2d 6d 61 74 63 | 68 65 73 2d 73 74 72 69 |unt-matc|hes-stri|
|00001a80| 6e 67 20 22 5c 6e 22 20 | 65 6d 65 72 67 65 2d 62 |ng "\n" |emerge-b|
|00001a90| 65 66 6f 72 65 2d 66 6c | 61 67 2d 6c 69 6e 65 73 |efore-fl|ag-lines|
|00001aa0| 20 72 65 67 65 78 70 2d | 71 75 6f 74 65 20 65 6d | regexp-|quote em|
|00001ab0| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|00001ac0| 2d 6d 61 74 63 68 20 65 | 6d 65 72 67 65 2d 61 66 |-match e|merge-af|
|00001ad0| 74 65 72 2d 66 6c 61 67 | 20 65 6d 65 72 67 65 2d |ter-flag| emerge-|
|00001ae0| 61 66 74 65 72 2d 66 6c | 61 67 2d 6c 65 6e 67 74 |after-fl|ag-lengt|
|00001af0| 68 20 65 6d 65 72 67 65 | 2d 61 66 74 65 72 2d 66 |h emerge|-after-f|
|00001b00| 6c 61 67 2d 6c 69 6e 65 | 73 20 65 6d 65 72 67 65 |lag-line|s emerge|
|00001b10| 2d 61 66 74 65 72 2d 66 | 6c 61 67 2d 6d 61 74 63 |-after-f|lag-matc|
|00001b20| 68 5d 20 33 20 22 5c 0a | 46 75 6e 63 74 69 6f 6e |h] 3 "\.|Function|
|00001b30| 20 74 6f 20 62 65 20 63 | 61 6c 6c 65 64 20 61 66 | to be c|alled af|
|00001b40| 74 65 72 20 60 65 6d 65 | 72 67 65 2d 7b 62 65 66 |ter `eme|rge-{bef|
|00001b50| 6f 72 65 2c 61 66 74 65 | 72 7d 2d 66 6c 61 67 27 |ore,afte|r}-flag'|
|00001b60| 2e 0a 54 68 69 73 20 69 | 73 20 63 61 6c 6c 65 64 |..This i|s called|
|00001b70| 20 61 66 74 65 72 20 74 | 68 65 73 65 20 66 75 6e | after t|hese fun|
|00001b80| 63 74 69 6f 6e 73 20 61 | 72 65 20 63 68 61 6e 67 |ctions a|re chang|
|00001b90| 65 64 20 74 6f 20 63 6f | 6d 70 75 74 65 20 76 61 |ed to co|mpute va|
|00001ba0| 6c 75 65 73 20 74 68 61 | 74 0a 64 65 70 65 6e 64 |lues tha|t.depend|
|00001bb0| 20 6f 6e 20 74 68 65 20 | 66 6c 61 67 73 2e 22 5d | on the |flags."]|
|00001bc0| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 6d 65 |).(defal|ias 'eme|
|00001bd0| 72 67 65 2d 63 6f 75 6e | 74 2d 6d 61 74 63 68 65 |rge-coun|t-matche|
|00001be0| 73 2d 73 74 72 69 6e 67 | 20 23 5b 28 73 74 72 69 |s-string| #[(stri|
|00001bf0| 6e 67 20 72 65 67 65 78 | 70 29 20 22 c0 89 19 1a |ng regex|p) "....|
|00001c00| c3 5c 66 0d 5c 6e 23 83 | 15 00 09 54 11 c0 95 12 |.\f.\n#.|...T....|
|00001c10| 82 04 00 09 2a 87 22 20 | 5b 30 20 63 6f 75 6e 74 |....*." |[0 count|
|00001c20| 20 69 20 73 74 72 69 6e | 67 2d 6d 61 74 63 68 20 | i strin|g-match |
|00001c30| 72 65 67 65 78 70 20 73 | 74 72 69 6e 67 5d 20 34 |regexp s|tring] 4|
|00001c40| 20 22 5c 0a 52 65 74 75 | 72 6e 20 74 68 65 20 6e | "\.Retu|rn the n|
|00001c50| 75 6d 62 65 72 20 6f 66 | 20 6d 61 74 63 68 65 73 |umber of| matches|
|00001c60| 20 69 6e 20 53 54 52 49 | 4e 47 20 66 6f 72 20 52 | in STRI|NG for R|
|00001c70| 45 47 45 58 50 2e 22 5d | 29 0a 28 65 6d 65 72 67 |EGEXP."]|).(emerg|
|00001c80| 65 2d 6e 65 77 2d 66 6c | 61 67 73 29 0a 28 64 65 |e-new-fl|ags).(de|
|00001c90| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6d 69 6e 2d |fvar eme|rge-min-|
|00001ca0| 76 69 73 69 62 6c 65 2d | 6c 69 6e 65 73 20 33 20 |visible-|lines 3 |
|00001cb0| 22 5c 0a 2a 4e 75 6d 62 | 65 72 20 6f 66 20 6c 69 |"\.*Numb|er of li|
|00001cc0| 6e 65 73 20 74 68 61 74 | 20 77 65 20 77 61 6e 74 |nes that| we want|
|00001cd0| 20 74 6f 20 73 68 6f 77 | 20 61 62 6f 76 65 20 61 | to show| above a|
|00001ce0| 6e 64 20 62 65 6c 6f 77 | 20 74 68 65 20 66 6c 61 |nd below| the fla|
|00001cf0| 67 73 20 77 68 65 6e 20 | 77 65 20 61 72 65 0a 64 |gs when |we are.d|
|00001d00| 69 73 70 6c 61 79 69 6e | 67 20 61 20 64 69 66 66 |isplayin|g a diff|
|00001d10| 65 72 65 6e 63 65 2e 22 | 29 0a 28 64 65 66 76 61 |erence."|).(defva|
|00001d20| 72 20 65 6d 65 72 67 65 | 2d 74 65 6d 70 2d 66 69 |r emerge|-temp-fi|
|00001d30| 6c 65 2d 70 72 65 66 69 | 78 20 28 62 79 74 65 2d |le-prefi|x (byte-|
|00001d40| 63 6f 64 65 20 22 c0 c1 | 21 c2 1b 89 1c 83 15 00 |code "..|!.......|
|00001d50| 5c 66 47 c5 56 83 15 00 | 5c 66 82 16 00 c6 89 13 |\fG.V...|\f......|
|00001d60| 89 47 53 48 c7 55 83 26 | 00 0b c5 c8 4f 13 0b c9 |.GSH.U.&|....O...|
|00001d70| 50 2a 87 22 20 5b 67 65 | 74 65 6e 76 20 22 54 4d |P*." [ge|tenv "TM|
|00001d80| 50 44 49 52 22 20 6e 69 | 6c 20 64 20 65 6e 76 20 |PDIR" ni|l d env |
|00001d90| 30 20 22 2f 74 6d 70 22 | 20 34 37 20 2d 31 20 22 |0 "/tmp"| 47 -1 "|
|00001da0| 2f 65 6d 65 72 67 65 22 | 5d 20 34 29 20 22 5c 0a |/emerge"|] 4) "\.|
|00001db0| 2a 50 72 65 66 69 78 20 | 74 6f 20 70 75 74 20 6f |*Prefix |to put o|
|00001dc0| 6e 20 45 6d 65 72 67 65 | 20 74 65 6d 70 6f 72 61 |n Emerge| tempora|
|00001dd0| 72 79 20 66 69 6c 65 20 | 6e 61 6d 65 73 2e 0a 44 |ry file |names..D|
|00001de0| 6f 20 6e 6f 74 20 73 74 | 61 72 74 20 77 69 74 68 |o not st|art with|
|00001df0| 20 60 7e 2f 27 20 6f 72 | 20 60 7e 75 73 65 72 2d | `~/' or| `~user-|
|00001e00| 6e 61 6d 65 2f 27 2e 22 | 29 0a 28 64 65 66 76 61 |name/'."|).(defva|
|00001e10| 72 20 65 6d 65 72 67 65 | 2d 74 65 6d 70 2d 66 69 |r emerge|-temp-fi|
|00001e20| 6c 65 2d 6d 6f 64 65 20 | 33 38 34 20 22 5c 0a 2a |le-mode |384 "\.*|
|00001e30| 4d 6f 64 65 20 66 6f 72 | 20 45 6d 65 72 67 65 20 |Mode for| Emerge |
|00001e40| 74 65 6d 70 6f 72 61 72 | 79 20 66 69 6c 65 73 2e |temporar|y files.|
|00001e50| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00001e60| 65 2d 63 6f 6d 62 69 6e | 65 2d 76 65 72 73 69 6f |e-combin|e-versio|
|00001e70| 6e 73 2d 74 65 6d 70 6c | 61 74 65 20 22 23 69 66 |ns-templ|ate "#if|
|00001e80| 64 65 66 20 4e 45 57 5c | 6e 25 62 23 65 6c 73 65 |def NEW\|n%b#else|
|00001e90| 20 2f 2a 20 4e 45 57 20 | 2a 2f 5c 6e 25 61 23 65 | /* NEW |*/\n%a#e|
|00001ea0| 6e 64 69 66 20 2f 2a 20 | 4e 45 57 20 2a 2f 5c 6e |ndif /* |NEW */\n|
|00001eb0| 22 20 22 5c 0a 2a 54 65 | 6d 70 6c 61 74 65 20 66 |" "\.*Te|mplate f|
|00001ec0| 6f 72 20 60 65 6d 65 72 | 67 65 2d 63 6f 6d 62 69 |or `emer|ge-combi|
|00001ed0| 6e 65 2d 76 65 72 73 69 | 6f 6e 73 27 20 74 6f 20 |ne-versi|ons' to |
|00001ee0| 63 6f 6d 62 69 6e 65 20 | 74 68 65 20 74 77 6f 20 |combine |the two |
|00001ef0| 76 65 72 73 69 6f 6e 73 | 2e 0a 54 68 65 20 74 65 |versions|..The te|
|00001f00| 6d 70 6c 61 74 65 20 69 | 73 20 69 6e 73 65 72 74 |mplate i|s insert|
|00001f10| 65 64 20 61 73 20 61 20 | 73 74 72 69 6e 67 2c 20 |ed as a |string, |
|00001f20| 77 69 74 68 20 74 68 65 | 20 66 6f 6c 6c 6f 77 69 |with the| followi|
|00001f30| 6e 67 20 69 6e 74 65 72 | 70 6f 6c 61 74 69 6f 6e |ng inter|polation|
|00001f40| 73 3a 0a 09 25 61 09 74 | 68 65 20 41 20 76 65 72 |s:..%a.t|he A ver|
|00001f50| 73 69 6f 6e 20 6f 66 20 | 74 68 65 20 64 69 66 66 |sion of |the diff|
|00001f60| 65 72 65 6e 63 65 0a 09 | 25 62 09 74 68 65 20 42 |erence..|%b.the B|
|00001f70| 20 76 65 72 73 69 6f 6e | 20 6f 66 20 74 68 65 20 | version| of the |
|00001f80| 64 69 66 66 65 72 65 6e | 63 65 0a 09 25 25 09 74 |differen|ce..%%.t|
|00001f90| 68 65 20 63 68 61 72 61 | 63 74 65 72 20 60 25 27 |he chara|cter `%'|
|00001fa0| 0a 44 6f 6e 27 74 20 66 | 6f 72 67 65 74 20 74 6f |.Don't f|orget to|
|00001fb0| 20 65 6e 64 20 74 68 65 | 20 74 65 6d 70 6c 61 74 | end the| templat|
|00001fc0| 65 20 77 69 74 68 20 61 | 20 6e 65 77 6c 69 6e 65 |e with a| newline|
|00001fd0| 2e 0a 4e 6f 74 65 20 74 | 68 61 74 20 74 68 69 73 |..Note t|hat this|
|00001fe0| 20 76 61 72 69 61 62 6c | 65 20 63 61 6e 20 62 65 | variabl|e can be|
|00001ff0| 20 6d 61 64 65 20 6c 6f | 63 61 6c 20 74 6f 20 61 | made lo|cal to a|
|00002000| 20 70 61 72 74 69 63 75 | 6c 61 72 20 6d 65 72 67 | particu|lar merg|
|00002010| 65 20 62 75 66 66 65 72 | 20 62 79 0a 67 69 76 69 |e buffer| by.givi|
|00002020| 6e 67 20 61 20 70 72 65 | 66 69 78 20 61 72 67 75 |ng a pre|fix argu|
|00002030| 6d 65 6e 74 20 74 6f 20 | 60 65 6d 65 72 67 65 2d |ment to |`emerge-|
|00002040| 73 65 74 2d 63 6f 6d 62 | 69 6e 65 2d 76 65 72 73 |set-comb|ine-vers|
|00002050| 69 6f 6e 73 2d 74 65 6d | 70 6c 61 74 65 27 2e 22 |ions-tem|plate'."|
|00002060| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00002070| 2d 62 61 73 69 63 2d 6b | 65 79 6d 61 70 20 6e 69 |-basic-k|eymap ni|
|00002080| 6c 20 22 5c 0a 4b 65 79 | 6d 61 70 20 6f 66 20 45 |l "\.Key|map of E|
|00002090| 6d 65 72 67 65 20 63 6f | 6d 6d 61 6e 64 73 2e 0a |merge co|mmands..|
|000020a0| 44 69 72 65 63 74 6c 79 | 20 61 76 61 69 6c 61 62 |Directly| availab|
|000020b0| 6c 65 20 69 6e 20 60 66 | 61 73 74 27 20 6d 6f 64 |le in `f|ast' mod|
|000020c0| 65 3b 0a 6d 75 73 74 20 | 62 65 20 70 72 65 66 69 |e;.must |be prefi|
|000020d0| 78 65 64 20 62 79 20 5c | 5c 3c 65 6d 65 72 67 65 |xed by \|\<emerge|
|000020e0| 2d 66 61 73 74 2d 6b 65 | 79 6d 61 70 3e 5c 5c 5b |-fast-ke|ymap>\\[|
|000020f0| 65 6d 65 72 67 65 2d 62 | 61 73 69 63 2d 6b 65 79 |emerge-b|asic-key|
|00002100| 6d 61 70 5d 20 69 6e 20 | 60 65 64 69 74 27 20 6d |map] in |`edit' m|
|00002110| 6f 64 65 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |ode.").(|defvar e|
|00002120| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6b 65 79 6d 61 |merge-fa|st-keyma|
|00002130| 70 20 6e 69 6c 20 22 5c | 0a 4c 6f 63 61 6c 20 6b |p nil "\|.Local k|
|00002140| 65 79 6d 61 70 20 75 73 | 65 64 20 69 6e 20 45 6d |eymap us|ed in Em|
|00002150| 65 72 67 65 20 60 66 61 | 73 74 27 20 6d 6f 64 65 |erge `fa|st' mode|
|00002160| 2e 0a 4d 61 6b 65 73 20 | 45 6d 65 72 67 65 20 63 |..Makes |Emerge c|
|00002170| 6f 6d 6d 61 6e 64 73 20 | 64 69 72 65 63 74 6c 79 |ommands |directly|
|00002180| 20 61 76 61 69 6c 61 62 | 6c 65 2e 22 29 0a 28 62 | availab|le.").(b|
|00002190| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 84 5c 6e |yte-code| "..!.\n|
|000021a0| 00 c2 c3 21 11 c0 c4 21 | 84 14 00 c2 c5 21 14 c0 |...!...!|.....!..|
|000021b0| c6 21 84 1f 00 c2 c7 21 | 16 06 c0 87 22 20 5b 62 |.!.....!|...." [b|
|000021c0| 6f 75 6e 64 70 20 65 6d | 65 72 67 65 2d 6f 70 74 |oundp em|erge-opt|
|000021d0| 69 6f 6e 73 2d 6d 65 6e | 75 20 6d 61 6b 65 2d 73 |ions-men|u make-s|
|000021e0| 70 61 72 73 65 2d 6b 65 | 79 6d 61 70 20 22 4f 70 |parse-ke|ymap "Op|
|000021f0| 74 69 6f 6e 73 22 20 65 | 6d 65 72 67 65 2d 6d 65 |tions" e|merge-me|
|00002200| 72 67 65 2d 6d 65 6e 75 | 20 22 4d 65 72 67 65 22 |rge-menu| "Merge"|
|00002210| 20 65 6d 65 72 67 65 2d | 6d 6f 76 65 2d 6d 65 6e | emerge-|move-men|
|00002220| 75 20 22 4d 6f 76 65 22 | 5d 20 32 29 0a 28 64 65 |u "Move"|] 2).(de|
|00002230| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 63 6f 6d 6d |fvar eme|rge-comm|
|00002240| 61 6e 64 2d 70 72 65 66 | 69 78 20 22 03 03 22 20 |and-pref|ix ".." |
|00002250| 22 5c 0a 2a 43 6f 6d 6d | 61 6e 64 20 70 72 65 66 |"\.*Comm|and pref|
|00002260| 69 78 20 66 6f 72 20 45 | 6d 65 72 67 65 20 63 6f |ix for E|merge co|
|00002270| 6d 6d 61 6e 64 73 20 69 | 6e 20 60 65 64 69 74 27 |mmands i|n `edit'|
|00002280| 20 6d 6f 64 65 2e 0a 4d | 75 73 74 20 62 65 20 73 | mode..M|ust be s|
|00002290| 65 74 20 62 65 66 6f 72 | 65 20 45 6d 65 72 67 65 |et befor|e Emerge|
|000022a0| 20 69 73 20 6c 6f 61 64 | 65 64 2e 22 29 0a 28 64 | is load|ed.").(d|
|000022b0| 65 66 61 6c 69 61 73 20 | 28 71 75 6f 74 65 20 65 |efalias |(quote e|
|000022c0| 6d 65 72 67 65 2d 73 65 | 74 75 70 2d 66 69 78 65 |merge-se|tup-fixe|
|000022d0| 64 2d 6b 65 79 6d 61 70 | 73 29 20 23 5b 6e 69 6c |d-keymap|s) #[nil|
|000022e0| 20 22 c0 20 11 c2 09 21 | 88 c3 09 c4 c5 23 88 c3 | ". ...!|.....#..|
|000022f0| 09 c6 c7 23 88 c3 09 c8 | c9 23 88 c3 09 ca cb 23 |...#....|.#.....#|
|00002300| 88 c3 09 cc cd 23 88 c3 | 09 ce cf 23 88 c3 09 d0 |.....#..|...#....|
|00002310| d1 23 88 c3 09 d2 d3 23 | 88 c3 09 d4 d5 23 88 c3 |.#.....#|.....#..|
|00002320| 09 d6 d7 23 88 c3 09 d8 | d9 23 88 c3 09 da db 23 |...#....|.#.....#|
|00002330| 88 c3 09 dc dd 23 88 c3 | 09 de df 23 88 c3 09 e0 |.....#..|...#....|
|00002340| d9 23 88 c3 09 e1 e2 23 | 88 c3 09 e3 e4 23 88 c3 |.#.....#|.....#..|
|00002350| 09 e5 d9 23 88 c3 09 e6 | e7 23 88 c3 09 e8 e9 23 |...#....|.#.....#|
|00002360| 88 c3 09 ea d9 23 88 c3 | 09 eb ec 23 88 c3 09 ed |.....#..|...#....|
|00002370| ee 23 88 c3 09 ef f0 23 | 88 c3 09 f1 f2 23 88 c3 |.#.....#|.....#..|
|00002380| 09 f3 f4 23 88 c3 09 f5 | f6 23 88 c3 09 f7 f8 23 |...#....|.#.....#|
|00002390| 88 c3 09 f9 fa 23 88 c3 | 09 fb d9 23 88 c3 09 fc |.....#..|...#....|
|000023a0| fd 23 88 c3 09 fe ff 23 | 88 c3 09 81 40 00 81 41 |.#.....#|....@..A|
|000023b0| 00 23 88 c3 09 81 42 00 | 81 43 00 23 88 c3 09 81 |.#....B.|.C.#....|
|000023c0| 44 00 81 45 00 23 88 c3 | 09 81 46 00 81 47 00 23 |D..E.#..|..F..G.#|
|000023d0| 88 c3 09 81 48 00 81 49 | 00 23 88 c3 09 81 4a 00 |....H..I|.#....J.|
|000023e0| 81 4b 00 23 88 c3 09 81 | 4c 00 81 4d 00 23 88 c3 |.K.#....|L..M.#..|
|000023f0| 09 81 4e 00 81 4f 00 23 | 88 c1 09 4d 88 81 50 00 |..N..O.#|...M..P.|
|00002400| 09 21 16 51 c3 0e 51 0e | 52 c1 23 88 81 51 00 0e |.!.Q..Q.|R.#..Q..|
|00002410| 51 4d 88 81 53 00 81 54 | 00 81 55 00 0e 51 81 56 |QM..S..T|..U..Q.V|
|00002420| 00 20 24 88 81 53 00 81 | 57 00 81 58 00 0e 51 81 |. $..S..|W..X..Q.|
|00002430| 56 00 20 24 88 c3 09 81 | 59 00 81 5a 00 20 23 88 |V. $....|Y..Z. #.|
|00002440| c3 0e 51 81 5b 00 81 5c | 5c 00 0e 5d 42 23 88 c3 |..Q.[..\|\..]B#..|
|00002450| 0e 51 81 5e 00 81 5f 00 | 0e 60 42 23 88 c3 0e 51 |.Q.^.._.|.`B#...Q|
|00002460| 81 61 00 81 62 00 0e 63 | 42 23 88 c3 0e 63 81 64 |.a..b..c|B#...c.d|
|00002470| 00 81 65 00 23 88 c3 0e | 63 81 66 00 81 67 00 23 |..e.#...|c.f..g.#|
|00002480| 88 c3 0e 63 81 68 00 81 | 69 00 23 88 c3 0e 63 81 |...c.h..|i.#...c.|
|00002490| 6a 00 81 6b 00 23 88 c3 | 0e 63 81 6c 00 81 6d 00 |j..k.#..|.c.l..m.|
|000024a0| 23 88 c3 0e 63 81 6e 00 | 81 6f 00 23 88 c3 0e 63 |#...c.n.|.o.#...c|
|000024b0| 81 70 00 81 71 00 23 88 | c3 0e 63 81 72 00 81 73 |.p..q.#.|..c.r..s|
|000024c0| 00 23 88 c3 0e 63 81 74 | 00 81 75 00 23 88 c3 0e |.#...c.t|..u.#...|
|000024d0| 63 81 76 00 81 77 00 23 | 88 c3 0e 63 81 78 00 81 |c.v..w.#|...c.x..|
|000024e0| 79 00 23 88 c3 0e 5d 81 | 7a 00 81 7b 00 23 88 c3 |y.#...].|z..{.#..|
|000024f0| 0e 5d 81 7c 00 81 7d 00 | 23 88 c3 0e 5d 81 7e 00 |.].|..}.|#...].~.|
|00002500| 81 7f 00 23 88 c3 0e 5d | 81 80 00 81 81 00 23 88 |...#...]|......#.|
|00002510| c3 0e 5d 81 82 00 81 83 | 00 23 88 c3 0e 5d 81 84 |..].....|.#...]..|
|00002520| 00 81 85 00 23 88 c3 0e | 5d 81 86 00 81 87 00 23 |....#...|]......#|
|00002530| 88 c3 0e 5d 81 88 00 81 | 89 00 23 88 c3 0e 5d 81 |...]....|..#...].|
|00002540| 8a 00 81 8b 00 23 88 c3 | 0e 60 81 8c 00 81 8d 00 |.....#..|.`......|
|00002550| 23 88 c3 0e 60 81 8e 00 | 81 8f 00 23 88 c3 0e 60 |#...`...|...#...`|
|00002560| 81 90 00 81 91 00 23 88 | c3 0e 60 81 92 00 81 93 |......#.|..`.....|
|00002570| 00 23 88 c3 0e 60 81 94 | 00 81 95 00 23 88 c3 0e |.#...`..|....#...|
|00002580| 60 81 96 00 81 97 00 23 | 88 c3 0e 60 81 98 00 81 |`......#|...`....|
|00002590| 99 00 23 88 c3 0e 60 81 | 9a 00 81 9b 00 23 88 c3 |..#...`.|.....#..|
|000025a0| 0e 60 81 9c 00 81 9d 00 | 23 88 c3 0e 60 81 9e 00 |.`......|#...`...|
|000025b0| 81 9f 00 23 88 c3 0e 60 | 81 a0 00 81 a1 00 23 88 |...#...`|......#.|
|000025c0| c3 0e 60 81 a2 00 81 a3 | 00 23 87 22 20 5b 6d 61 |..`.....|.#." [ma|
|000025d0| 6b 65 2d 6b 65 79 6d 61 | 70 20 65 6d 65 72 67 65 |ke-keyma|p emerge|
|000025e0| 2d 62 61 73 69 63 2d 6b | 65 79 6d 61 70 20 73 75 |-basic-k|eymap su|
|000025f0| 70 70 72 65 73 73 2d 6b | 65 79 6d 61 70 20 64 65 |ppress-k|eymap de|
|00002600| 66 69 6e 65 2d 6b 65 79 | 20 22 70 22 20 65 6d 65 |fine-key| "p" eme|
|00002610| 72 67 65 2d 70 72 65 76 | 69 6f 75 73 2d 64 69 66 |rge-prev|ious-dif|
|00002620| 66 65 72 65 6e 63 65 20 | 22 6e 22 20 65 6d 65 72 |ference |"n" emer|
|00002630| 67 65 2d 6e 65 78 74 2d | 64 69 66 66 65 72 65 6e |ge-next-|differen|
|00002640| 63 65 20 22 61 22 20 65 | 6d 65 72 67 65 2d 73 65 |ce "a" e|merge-se|
|00002650| 6c 65 63 74 2d 41 20 22 | 62 22 20 65 6d 65 72 67 |lect-A "|b" emerg|
|00002660| 65 2d 73 65 6c 65 63 74 | 2d 42 20 22 6a 22 20 65 |e-select|-B "j" e|
|00002670| 6d 65 72 67 65 2d 6a 75 | 6d 70 2d 74 6f 2d 64 69 |merge-ju|mp-to-di|
|00002680| 66 66 65 72 65 6e 63 65 | 20 22 2e 22 20 65 6d 65 |fference| "." eme|
|00002690| 72 67 65 2d 66 69 6e 64 | 2d 64 69 66 66 65 72 65 |rge-find|-differe|
|000026a0| 6e 63 65 20 22 71 22 20 | 65 6d 65 72 67 65 2d 71 |nce "q" |emerge-q|
|000026b0| 75 69 74 20 22 1d 22 20 | 65 6d 65 72 67 65 2d 61 |uit "." |emerge-a|
|000026c0| 62 6f 72 74 20 22 66 22 | 20 65 6d 65 72 67 65 2d |bort "f"| emerge-|
|000026d0| 66 61 73 74 2d 6d 6f 64 | 65 20 22 65 22 20 65 6d |fast-mod|e "e" em|
|000026e0| 65 72 67 65 2d 65 64 69 | 74 2d 6d 6f 64 65 20 22 |erge-edi|t-mode "|
|000026f0| 73 22 20 6e 69 6c 20 22 | 73 61 22 20 65 6d 65 72 |s" nil "|sa" emer|
|00002700| 67 65 2d 61 75 74 6f 2d | 61 64 76 61 6e 63 65 20 |ge-auto-|advance |
|00002710| 22 73 73 22 20 65 6d 65 | 72 67 65 2d 73 6b 69 70 |"ss" eme|rge-skip|
|00002720| 2d 70 72 65 66 65 72 73 | 20 22 6c 22 20 65 6d 65 |-prefers| "l" eme|
|00002730| 72 67 65 2d 72 65 63 65 | 6e 74 65 72 20 22 64 22 |rge-rece|nter "d"|
|00002740| 20 22 64 61 22 20 65 6d | 65 72 67 65 2d 64 65 66 | "da" em|erge-def|
|00002750| 61 75 6c 74 2d 41 20 22 | 64 62 22 20 65 6d 65 72 |ault-A "|db" emer|
|00002760| 67 65 2d 64 65 66 61 75 | 6c 74 2d 42 20 22 63 22 |ge-defau|lt-B "c"|
|00002770| 20 22 63 61 22 20 65 6d | 65 72 67 65 2d 63 6f 70 | "ca" em|erge-cop|
|00002780| 79 2d 61 73 2d 6b 69 6c | 6c 2d 41 20 22 63 62 22 |y-as-kil|l-A "cb"|
|00002790| 20 65 6d 65 72 67 65 2d | 63 6f 70 79 2d 61 73 2d | emerge-|copy-as-|
|000027a0| 6b 69 6c 6c 2d 42 20 22 | 69 22 20 22 69 61 22 20 |kill-B "|i" "ia" |
|000027b0| 65 6d 65 72 67 65 2d 69 | 6e 73 65 72 74 2d 41 20 |emerge-i|nsert-A |
|000027c0| 22 69 62 22 20 65 6d 65 | 72 67 65 2d 69 6e 73 65 |"ib" eme|rge-inse|
|000027d0| 72 74 2d 42 20 22 6d 22 | 20 65 6d 65 72 67 65 2d |rt-B "m"| emerge-|
|000027e0| 6d 61 72 6b 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |mark-dif|ference |
|000027f0| 22 76 22 20 65 6d 65 72 | 67 65 2d 73 63 72 6f 6c |"v" emer|ge-scrol|
|00002800| 6c 2d 75 70 20 22 5e 22 | 20 65 6d 65 72 67 65 2d |l-up "^"| emerge-|
|00002810| 73 63 72 6f 6c 6c 2d 64 | 6f 77 6e 20 22 3c 22 20 |scroll-d|own "<" |
|00002820| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 6c 65 |emerge-s|croll-le|
|00002830| 66 74 20 22 3e 22 20 65 | 6d 65 72 67 65 2d 73 63 |ft ">" e|merge-sc|
|00002840| 72 6f 6c 6c 2d 72 69 67 | 68 74 20 22 7c 22 20 65 |roll-rig|ht "|" e|
|00002850| 6d 65 72 67 65 2d 73 63 | 72 6f 6c 6c 2d 72 65 73 |merge-sc|roll-res|
|00002860| 65 74 20 22 78 22 20 22 | 78 31 22 20 65 6d 65 72 |et "x" "|x1" emer|
|00002870| 67 65 2d 6f 6e 65 2d 6c | 69 6e 65 2d 77 69 6e 64 |ge-one-l|ine-wind|
|00002880| 6f 77 20 22 78 63 22 20 | 65 6d 65 72 67 65 2d 63 |ow "xc" |emerge-c|
|00002890| 6f 6d 62 69 6e 65 2d 76 | 65 72 73 69 6f 6e 73 20 |ombine-v|ersions |
|000028a0| 22 78 43 22 20 65 6d 65 | 72 67 65 2d 63 6f 6d 62 |"xC" eme|rge-comb|
|000028b0| 69 6e 65 2d 76 65 72 73 | 69 6f 6e 73 2d 72 65 67 |ine-vers|ions-reg|
|000028c0| 69 73 74 65 72 20 22 78 | 66 22 20 65 6d 65 72 67 |ister "x|f" emerg|
|000028d0| 65 2d 66 69 6c 65 2d 6e | 61 6d 65 73 20 22 78 6a |e-file-n|ames "xj|
|000028e0| 22 20 65 6d 65 72 67 65 | 2d 6a 6f 69 6e 2d 64 69 |" emerge|-join-di|
|000028f0| 66 66 65 72 65 6e 63 65 | 73 20 22 78 6c 22 20 65 |fference|s "xl" e|
|00002900| 6d 65 72 67 65 2d 6c 69 | 6e 65 2d 6e 75 6d 62 65 |merge-li|ne-numbe|
|00002910| 72 73 20 22 78 6d 22 20 | 65 6d 65 72 67 65 2d 73 |rs "xm" |emerge-s|
|00002920| 65 74 2d 6d 65 72 67 65 | 2d 6d 6f 64 65 20 22 78 |et-merge|-mode "x|
|00002930| 73 22 20 65 6d 65 72 67 | 65 2d 73 70 6c 69 74 2d |s" emerg|e-split-|
|00002940| 64 69 66 66 65 72 65 6e | 63 65 20 22 78 74 22 20 |differen|ce "xt" |
|00002950| 65 6d 65 72 67 65 2d 74 | 72 69 6d 2d 64 69 66 66 |emerge-t|rim-diff|
|00002960| 65 72 65 6e 63 65 20 22 | 78 78 22 20 65 6d 65 72 |erence "|xx" emer|
|00002970| 67 65 2d 73 65 74 2d 63 | 6f 6d 62 69 6e 65 2d 76 |ge-set-c|ombine-v|
|00002980| 65 72 73 69 6f 6e 73 2d | 74 65 6d 70 6c 61 74 65 |ersions-|template|
|00002990| 20 63 6f 70 79 2d 6b 65 | 79 6d 61 70 20 65 6d 65 | copy-ke|ymap eme|
|000029a0| 72 67 65 2d 66 61 73 74 | 2d 6b 65 79 6d 61 70 20 |rge-fast|-keymap |
|000029b0| 65 6d 65 72 67 65 2d 63 | 6f 6d 6d 61 6e 64 2d 70 |emerge-c|ommand-p|
|000029c0| 72 65 66 69 78 20 73 75 | 62 73 74 69 74 75 74 65 |refix su|bstitute|
|000029d0| 2d 6b 65 79 2d 64 65 66 | 69 6e 69 74 69 6f 6e 20 |-key-def|inition |
|000029e0| 77 72 69 74 65 2d 66 69 | 6c 65 20 65 6d 65 72 67 |write-fi|le emerg|
|000029f0| 65 2d 71 75 65 72 79 2d | 77 72 69 74 65 2d 66 69 |e-query-|write-fi|
|00002a00| 6c 65 20 63 75 72 72 65 | 6e 74 2d 67 6c 6f 62 61 |le curre|nt-globa|
|00002a10| 6c 2d 6d 61 70 20 73 61 | 76 65 2d 62 75 66 66 65 |l-map sa|ve-buffe|
|00002a20| 72 20 65 6d 65 72 67 65 | 2d 71 75 65 72 79 2d 73 |r emerge|-query-s|
|00002a30| 61 76 65 2d 62 75 66 66 | 65 72 20 5b 6d 65 6e 75 |ave-buff|er [menu|
|00002a40| 2d 62 61 72 5d 20 6d 61 | 6b 65 2d 73 70 61 72 73 |-bar] ma|ke-spars|
|00002a50| 65 2d 6b 65 79 6d 61 70 | 20 5b 6d 65 6e 75 2d 62 |e-keymap| [menu-b|
|00002a60| 61 72 20 6f 70 74 69 6f | 6e 73 5d 20 22 4f 70 74 |ar optio|ns] "Opt|
|00002a70| 69 6f 6e 73 22 20 65 6d | 65 72 67 65 2d 6f 70 74 |ions" em|erge-opt|
|00002a80| 69 6f 6e 73 2d 6d 65 6e | 75 20 5b 6d 65 6e 75 2d |ions-men|u [menu-|
|00002a90| 62 61 72 20 6d 65 72 67 | 65 5d 20 22 4d 65 72 67 |bar merg|e] "Merg|
|00002aa0| 65 22 20 65 6d 65 72 67 | 65 2d 6d 65 72 67 65 2d |e" emerg|e-merge-|
|00002ab0| 6d 65 6e 75 20 5b 6d 65 | 6e 75 2d 62 61 72 20 6d |menu [me|nu-bar m|
|00002ac0| 6f 76 65 5d 20 22 4d 6f | 76 65 22 20 65 6d 65 72 |ove] "Mo|ve" emer|
|00002ad0| 67 65 2d 6d 6f 76 65 2d | 6d 65 6e 75 20 5b 65 6d |ge-move-|menu [em|
|00002ae0| 65 72 67 65 2d 73 63 72 | 6f 6c 6c 2d 72 65 73 65 |erge-scr|oll-rese|
|00002af0| 74 5d 20 28 22 53 63 72 | 6f 6c 6c 20 52 65 73 65 |t] ("Scr|oll Rese|
|00002b00| 74 22 20 2e 20 65 6d 65 | 72 67 65 2d 73 63 72 6f |t" . eme|rge-scro|
|00002b10| 6c 6c 2d 72 65 73 65 74 | 29 20 5b 65 6d 65 72 67 |ll-reset|) [emerg|
|00002b20| 65 2d 73 63 72 6f 6c 6c | 2d 72 69 67 68 74 5d 20 |e-scroll|-right] |
|00002b30| 28 22 53 63 72 6f 6c 6c | 20 52 69 67 68 74 22 20 |("Scroll| Right" |
|00002b40| 2e 20 65 6d 65 72 67 65 | 2d 73 63 72 6f 6c 6c 2d |. emerge|-scroll-|
|00002b50| 72 69 67 68 74 29 20 5b | 65 6d 65 72 67 65 2d 73 |right) [|emerge-s|
|00002b60| 63 72 6f 6c 6c 2d 6c 65 | 66 74 5d 20 28 22 53 63 |croll-le|ft] ("Sc|
|00002b70| 72 6f 6c 6c 20 4c 65 66 | 74 22 20 2e 20 65 6d 65 |roll Lef|t" . eme|
|00002b80| 72 67 65 2d 73 63 72 6f | 6c 6c 2d 6c 65 66 74 29 |rge-scro|ll-left)|
|00002b90| 20 5b 65 6d 65 72 67 65 | 2d 73 63 72 6f 6c 6c 2d | [emerge|-scroll-|
|00002ba0| 64 6f 77 6e 5d 20 28 22 | 53 63 72 6f 6c 6c 20 44 |down] ("|Scroll D|
|00002bb0| 6f 77 6e 22 20 2e 20 65 | 6d 65 72 67 65 2d 73 63 |own" . e|merge-sc|
|00002bc0| 72 6f 6c 6c 2d 64 6f 77 | 6e 29 20 5b 65 6d 65 72 |roll-dow|n) [emer|
|00002bd0| 67 65 2d 73 63 72 6f 6c | 6c 2d 75 70 5d 20 28 22 |ge-scrol|l-up] ("|
|00002be0| 53 63 72 6f 6c 6c 20 55 | 70 22 20 2e 20 65 6d 65 |Scroll U|p" . eme|
|00002bf0| 72 67 65 2d 73 63 72 6f | 6c 6c 2d 75 70 29 20 5b |rge-scro|ll-up) [|
|00002c00| 65 6d 65 72 67 65 2d 72 | 65 63 65 6e 74 65 72 5d |emerge-r|ecenter]|
|00002c10| 20 28 22 52 65 63 65 6e | 74 65 72 22 20 2e 20 65 | ("Recen|ter" . e|
|00002c20| 6d 65 72 67 65 2d 72 65 | 63 65 6e 74 65 72 29 20 |merge-re|center) |
|00002c30| 5b 65 6d 65 72 67 65 2d | 6d 61 72 6b 2d 64 69 66 |[emerge-|mark-dif|
|00002c40| 66 65 72 65 6e 63 65 5d | 20 28 22 4d 61 72 6b 20 |ference]| ("Mark |
|00002c50| 44 69 66 66 65 72 65 6e | 63 65 22 20 2e 20 65 6d |Differen|ce" . em|
|00002c60| 65 72 67 65 2d 6d 61 72 | 6b 2d 64 69 66 66 65 72 |erge-mar|k-differ|
|00002c70| 65 6e 63 65 29 20 5b 65 | 6d 65 72 67 65 2d 6a 75 |ence) [e|merge-ju|
|00002c80| 6d 70 2d 74 6f 2d 64 69 | 66 66 65 72 65 6e 63 65 |mp-to-di|fference|
|00002c90| 5d 20 28 22 4a 75 6d 70 | 20 54 6f 20 44 69 66 66 |] ("Jump| To Diff|
|00002ca0| 65 72 65 6e 63 65 22 20 | 2e 20 65 6d 65 72 67 65 |erence" |. emerge|
|00002cb0| 2d 6a 75 6d 70 2d 74 6f | 2d 64 69 66 66 65 72 65 |-jump-to|-differe|
|00002cc0| 6e 63 65 29 20 5b 65 6d | 65 72 67 65 2d 66 69 6e |nce) [em|erge-fin|
|00002cd0| 64 2d 64 69 66 66 65 72 | 65 6e 63 65 5d 20 28 22 |d-differ|ence] ("|
|00002ce0| 46 69 6e 64 20 44 69 66 | 66 65 72 65 6e 63 65 22 |Find Dif|ference"|
|00002cf0| 20 2e 20 65 6d 65 72 67 | 65 2d 66 69 6e 64 2d 64 | . emerg|e-find-d|
|00002d00| 69 66 66 65 72 65 6e 63 | 65 29 20 5b 65 6d 65 72 |ifferenc|e) [emer|
|00002d10| 67 65 2d 70 72 65 76 69 | 6f 75 73 2d 64 69 66 66 |ge-previ|ous-diff|
|00002d20| 65 72 65 6e 63 65 5d 20 | 28 22 50 72 65 76 69 6f |erence] |("Previo|
|00002d30| 75 73 20 44 69 66 66 65 | 72 65 6e 63 65 22 20 2e |us Diffe|rence" .|
|00002d40| 20 65 6d 65 72 67 65 2d | 70 72 65 76 69 6f 75 73 | emerge-|previous|
|00002d50| 2d 64 69 66 66 65 72 65 | 6e 63 65 29 20 5b 65 6d |-differe|nce) [em|
|00002d60| 65 72 67 65 2d 6e 65 78 | 74 2d 64 69 66 66 65 72 |erge-nex|t-differ|
|00002d70| 65 6e 63 65 5d 20 28 22 | 4e 65 78 74 20 44 69 66 |ence] ("|Next Dif|
|00002d80| 66 65 72 65 6e 63 65 22 | 20 2e 20 65 6d 65 72 67 |ference"| . emerg|
|00002d90| 65 2d 6e 65 78 74 2d 64 | 69 66 66 65 72 65 6e 63 |e-next-d|ifferenc|
|00002da0| 65 29 20 5b 65 6d 65 72 | 67 65 2d 6f 6e 65 2d 6c |e) [emer|ge-one-l|
|00002db0| 69 6e 65 2d 77 69 6e 64 | 6f 77 5d 20 28 22 4f 6e |ine-wind|ow] ("On|
|00002dc0| 65 20 4c 69 6e 65 20 57 | 69 6e 64 6f 77 22 20 2e |e Line W|indow" .|
|00002dd0| 20 65 6d 65 72 67 65 2d | 6f 6e 65 2d 6c 69 6e 65 | emerge-|one-line|
|00002de0| 2d 77 69 6e 64 6f 77 29 | 20 5b 65 6d 65 72 67 65 |-window)| [emerge|
|00002df0| 2d 73 65 74 2d 6d 65 72 | 67 65 2d 6d 6f 64 65 5d |-set-mer|ge-mode]|
|00002e00| 20 28 22 53 65 74 20 4d | 65 72 67 65 20 4d 6f 64 | ("Set M|erge Mod|
|00002e10| 65 22 20 2e 20 65 6d 65 | 72 67 65 2d 73 65 74 2d |e" . eme|rge-set-|
|00002e20| 6d 65 72 67 65 2d 6d 6f | 64 65 29 20 5b 65 6d 65 |merge-mo|de) [eme|
|00002e30| 72 67 65 2d 73 65 74 2d | 63 6f 6d 62 69 6e 65 2d |rge-set-|combine-|
|00002e40| 74 65 6d 70 6c 61 74 65 | 5d 20 28 22 53 65 74 20 |template|] ("Set |
|00002e50| 43 6f 6d 62 69 6e 65 20 | 54 65 6d 70 6c 61 74 65 |Combine |Template|
|00002e60| 2e 2e 2e 22 20 2e 20 65 | 6d 65 72 67 65 2d 73 65 |..." . e|merge-se|
|00002e70| 74 2d 63 6f 6d 62 69 6e | 65 2d 74 65 6d 70 6c 61 |t-combin|e-templa|
|00002e80| 74 65 29 20 5b 65 6d 65 | 72 67 65 2d 64 65 66 61 |te) [eme|rge-defa|
|00002e90| 75 6c 74 2d 42 5d 20 28 | 22 44 65 66 61 75 6c 74 |ult-B] (|"Default|
|00002ea0| 20 42 22 20 2e 20 65 6d | 65 72 67 65 2d 64 65 66 | B" . em|erge-def|
|00002eb0| 61 75 6c 74 2d 42 29 20 | 5b 65 6d 65 72 67 65 2d |ault-B) |[emerge-|
|00002ec0| 64 65 66 61 75 6c 74 2d | 41 5d 20 28 22 44 65 66 |default-|A] ("Def|
|00002ed0| 61 75 6c 74 20 41 22 20 | 2e 20 65 6d 65 72 67 65 |ault A" |. emerge|
|00002ee0| 2d 64 65 66 61 75 6c 74 | 2d 41 29 20 5b 65 6d 65 |-default|-A) [eme|
|00002ef0| 72 67 65 2d 73 6b 69 70 | 2d 70 72 65 66 65 72 73 |rge-skip|-prefers|
|00002f00| 5d 20 28 22 53 6b 69 70 | 20 50 72 65 66 65 72 73 |] ("Skip| Prefers|
|00002f10| 22 20 2e 20 65 6d 65 72 | 67 65 2d 73 6b 69 70 2d |" . emer|ge-skip-|
|00002f20| 70 72 65 66 65 72 73 29 | 20 5b 65 6d 65 72 67 65 |prefers)| [emerge|
|00002f30| 2d 61 75 74 6f 2d 61 64 | 76 61 6e 63 65 5d 20 28 |-auto-ad|vance] (|
|00002f40| 22 41 75 74 6f 20 41 64 | 76 61 6e 63 65 22 20 2e |"Auto Ad|vance" .|
|00002f50| 20 65 6d 65 72 67 65 2d | 61 75 74 6f 2d 61 64 76 | emerge-|auto-adv|
|00002f60| 61 6e 63 65 29 20 5b 65 | 6d 65 72 67 65 2d 65 64 |ance) [e|merge-ed|
|00002f70| 69 74 2d 6d 6f 64 65 5d | 20 28 22 45 64 69 74 20 |it-mode]| ("Edit |
|00002f80| 4d 6f 64 65 22 20 2e 20 | 65 6d 65 72 67 65 2d 65 |Mode" . |emerge-e|
|00002f90| 64 69 74 2d 6d 6f 64 65 | 29 20 5b 65 6d 65 72 67 |dit-mode|) [emerg|
|00002fa0| 65 2d 66 61 73 74 2d 6d | 6f 64 65 5d 20 28 22 46 |e-fast-m|ode] ("F|
|00002fb0| 61 73 74 20 4d 6f 64 65 | 22 20 2e 20 65 6d 65 72 |ast Mode|" . emer|
|00002fc0| 67 65 2d 66 61 73 74 2d | 6d 6f 64 65 29 20 5b 65 |ge-fast-|mode) [e|
|00002fd0| 6d 65 72 67 65 2d 61 62 | 6f 72 74 5d 20 28 22 41 |merge-ab|ort] ("A|
|00002fe0| 62 6f 72 74 22 20 2e 20 | 65 6d 65 72 67 65 2d 61 |bort" . |emerge-a|
|00002ff0| 62 6f 72 74 29 20 5b 65 | 6d 65 72 67 65 2d 71 75 |bort) [e|merge-qu|
|00003000| 69 74 5d 20 28 22 51 75 | 69 74 22 20 2e 20 65 6d |it] ("Qu|it" . em|
|00003010| 65 72 67 65 2d 71 75 69 | 74 29 20 5b 65 6d 65 72 |erge-qui|t) [emer|
|00003020| 67 65 2d 73 70 6c 69 74 | 2d 64 69 66 66 65 72 65 |ge-split|-differe|
|00003030| 6e 63 65 5d 20 28 22 53 | 70 6c 69 74 20 44 69 66 |nce] ("S|plit Dif|
|00003040| 66 65 72 65 6e 63 65 22 | 20 2e 20 65 6d 65 72 67 |ference"| . emerg|
|00003050| 65 2d 73 70 6c 69 74 2d | 64 69 66 66 65 72 65 6e |e-split-|differen|
|00003060| 63 65 29 20 5b 65 6d 65 | 72 67 65 2d 6a 6f 69 6e |ce) [eme|rge-join|
|00003070| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 5d 20 28 22 |-differe|nces] ("|
|00003080| 4a 6f 69 6e 20 44 69 66 | 66 65 72 65 6e 63 65 73 |Join Dif|ferences|
|00003090| 22 20 2e 20 65 6d 65 72 | 67 65 2d 6a 6f 69 6e 2d |" . emer|ge-join-|
|000030a0| 64 69 66 66 65 72 65 6e | 63 65 73 29 20 5b 65 6d |differen|ces) [em|
|000030b0| 65 72 67 65 2d 74 72 69 | 6d 2d 64 69 66 66 65 72 |erge-tri|m-differ|
|000030c0| 65 6e 63 65 5d 20 28 22 | 54 72 69 6d 20 44 69 66 |ence] ("|Trim Dif|
|000030d0| 66 65 72 65 6e 63 65 22 | 20 2e 20 65 6d 65 72 67 |ference"| . emerg|
|000030e0| 65 2d 74 72 69 6d 2d 64 | 69 66 66 65 72 65 6e 63 |e-trim-d|ifferenc|
|000030f0| 65 29 20 5b 65 6d 65 72 | 67 65 2d 63 6f 6d 62 69 |e) [emer|ge-combi|
|00003100| 6e 65 2d 76 65 72 73 69 | 6f 6e 73 5d 20 28 22 43 |ne-versi|ons] ("C|
|00003110| 6f 6d 62 69 6e 65 20 56 | 65 72 73 69 6f 6e 73 22 |ombine V|ersions"|
|00003120| 20 2e 20 65 6d 65 72 67 | 65 2d 63 6f 6d 62 69 6e | . emerg|e-combin|
|00003130| 65 2d 76 65 72 73 69 6f | 6e 73 29 20 5b 65 6d 65 |e-versio|ns) [eme|
|00003140| 72 67 65 2d 63 6f 70 79 | 2d 61 73 2d 6b 69 6c 6c |rge-copy|-as-kill|
|00003150| 2d 42 5d 20 28 22 43 6f | 70 79 20 42 20 61 73 20 |-B] ("Co|py B as |
|00003160| 4b 69 6c 6c 22 20 2e 20 | 65 6d 65 72 67 65 2d 63 |Kill" . |emerge-c|
|00003170| 6f 70 79 2d 61 73 2d 6b | 69 6c 6c 2d 42 29 20 5b |opy-as-k|ill-B) [|
|00003180| 65 6d 65 72 67 65 2d 63 | 6f 70 79 2d 61 73 2d 6b |emerge-c|opy-as-k|
|00003190| 69 6c 6c 2d 41 5d 20 28 | 22 43 6f 70 79 20 41 20 |ill-A] (|"Copy A |
|000031a0| 61 73 20 4b 69 6c 6c 22 | 20 2e 20 65 6d 65 72 67 |as Kill"| . emerg|
|000031b0| 65 2d 63 6f 70 79 2d 61 | 73 2d 6b 69 6c 6c 2d 41 |e-copy-a|s-kill-A|
|000031c0| 29 20 5b 65 6d 65 72 67 | 65 2d 69 6e 73 65 72 74 |) [emerg|e-insert|
|000031d0| 2d 42 5d 20 28 22 49 6e | 73 65 72 74 20 42 22 20 |-B] ("In|sert B" |
|000031e0| 2e 20 65 6d 65 72 67 65 | 2d 69 6e 73 65 72 74 2d |. emerge|-insert-|
|000031f0| 42 29 20 5b 65 6d 65 72 | 67 65 2d 69 6e 73 65 72 |B) [emer|ge-inser|
|00003200| 74 2d 41 5d 20 28 22 49 | 6e 73 65 72 74 20 41 22 |t-A] ("I|nsert A"|
|00003210| 20 2e 20 65 6d 65 72 67 | 65 2d 69 6e 73 65 72 74 | . emerg|e-insert|
|00003220| 2d 41 29 20 5b 65 6d 65 | 72 67 65 2d 73 65 6c 65 |-A) [eme|rge-sele|
|00003230| 63 74 2d 42 5d 20 28 22 | 53 65 6c 65 63 74 20 42 |ct-B] ("|Select B|
|00003240| 22 20 2e 20 65 6d 65 72 | 67 65 2d 73 65 6c 65 63 |" . emer|ge-selec|
|00003250| 74 2d 42 29 20 5b 65 6d | 65 72 67 65 2d 73 65 6c |t-B) [em|erge-sel|
|00003260| 65 63 74 2d 41 5d 20 28 | 22 53 65 6c 65 63 74 20 |ect-A] (|"Select |
|00003270| 41 22 20 2e 20 65 6d 65 | 72 67 65 2d 73 65 6c 65 |A" . eme|rge-sele|
|00003280| 63 74 2d 41 29 5d 20 35 | 5d 29 0a 28 64 65 66 76 |ct-A)] 5|]).(defv|
|00003290| 61 72 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 6e |ar emerg|e-mode n|
|000032a0| 69 6c 20 22 5c 0a 49 6e | 64 69 63 61 74 6f 72 20 |il "\.In|dicator |
|000032b0| 66 6f 72 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 2e |for emer|ge-mode.|
|000032c0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|000032d0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000032e0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000032f0| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 6d 6f |-local e|merge-mo|
|00003300| 64 65 20 70 75 74 20 70 | 72 65 73 65 72 76 65 64 |de put p|reserved|
|00003310| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00003320| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6d 6f 64 65 20 |merge-fa|st-mode |
|00003330| 6e 69 6c 20 22 5c 0a 49 | 6e 64 69 63 61 74 6f 72 |nil "\.I|ndicator|
|00003340| 20 66 6f 72 20 65 6d 65 | 72 67 65 2d 6d 6f 64 65 | for eme|rge-mode|
|00003350| 20 66 61 73 74 20 73 75 | 62 6d 6f 64 65 2e 22 29 | fast su|bmode.")|
|00003360| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00003370| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00003380| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00003390| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 66 61 73 74 |ocal eme|rge-fast|
|000033a0| 2d 6d 6f 64 65 20 70 75 | 74 20 70 72 65 73 65 72 |-mode pu|t preser|
|000033b0| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|000033c0| 72 20 65 6d 65 72 67 65 | 2d 65 64 69 74 2d 6d 6f |r emerge|-edit-mo|
|000033d0| 64 65 20 6e 69 6c 20 22 | 5c 0a 49 6e 64 69 63 61 |de nil "|\.Indica|
|000033e0| 74 6f 72 20 66 6f 72 20 | 65 6d 65 72 67 65 2d 6d |tor for |emerge-m|
|000033f0| 6f 64 65 20 65 64 69 74 | 20 73 75 62 6d 6f 64 65 |ode edit| submode|
|00003400| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00003410| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00003420| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00003430| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 65 |r-local |emerge-e|
|00003440| 64 69 74 2d 6d 6f 64 65 | 20 70 75 74 20 70 72 65 |dit-mode| put pre|
|00003450| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|00003460| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |fvar eme|rge-A-bu|
|00003470| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 54 68 65 20 |ffer nil| "\.The |
|00003480| 62 75 66 66 65 72 20 69 | 6e 20 77 68 69 63 68 20 |buffer i|n which |
|00003490| 74 68 65 20 41 20 76 61 | 72 69 61 6e 74 20 69 73 |the A va|riant is|
|000034a0| 20 73 74 6f 72 65 64 2e | 22 29 0a 28 62 79 74 65 | stored.|").(byte|
|000034b0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000034c0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000034d0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000034e0| 6d 65 72 67 65 2d 41 2d | 62 75 66 66 65 72 20 70 |merge-A-|buffer p|
|000034f0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|00003500| 34 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |4).(defv|ar emerg|
|00003510| 65 2d 42 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 22 |e-B-buff|er nil "|
|00003520| 5c 0a 54 68 65 20 62 75 | 66 66 65 72 20 69 6e 20 |\.The bu|ffer in |
|00003530| 77 68 69 63 68 20 74 68 | 65 20 42 20 76 61 72 69 |which th|e B vari|
|00003540| 61 6e 74 20 69 73 20 73 | 74 6f 72 65 64 2e 22 29 |ant is s|tored.")|
|00003550| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00003560| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00003570| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00003580| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 42 2d 62 75 |ocal eme|rge-B-bu|
|00003590| 66 66 65 72 20 70 75 74 | 20 70 72 65 73 65 72 76 |ffer put| preserv|
|000035a0| 65 64 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |ed t] 4)|.(defvar|
|000035b0| 20 65 6d 65 72 67 65 2d | 6d 65 72 67 65 2d 62 75 | emerge-|merge-bu|
|000035c0| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 54 68 65 20 |ffer nil| "\.The |
|000035d0| 62 75 66 66 65 72 20 69 | 6e 20 77 68 69 63 68 20 |buffer i|n which |
|000035e0| 74 68 65 20 6d 65 72 67 | 65 64 20 66 69 6c 65 20 |the merg|ed file |
|000035f0| 69 73 20 6d 61 6e 69 70 | 75 6c 61 74 65 64 2e 22 |is manip|ulated."|
|00003600| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00003610| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00003620| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00003630| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 6d 65 72 |local em|erge-mer|
|00003640| 67 65 2d 62 75 66 66 65 | 72 20 70 75 74 20 70 72 |ge-buffe|r put pr|
|00003650| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00003660| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 61 6e 63 |efvar em|erge-anc|
|00003670| 65 73 74 6f 72 2d 62 75 | 66 66 65 72 20 6e 69 6c |estor-bu|ffer nil|
|00003680| 20 22 5c 0a 54 68 65 20 | 62 75 66 66 65 72 20 69 | "\.The |buffer i|
|00003690| 6e 20 77 68 69 63 68 20 | 74 68 65 20 61 6e 63 65 |n which |the ance|
|000036a0| 73 74 6f 72 20 76 61 72 | 69 61 6e 74 20 69 73 20 |stor var|iant is |
|000036b0| 73 74 6f 72 65 64 2c 0a | 6f 72 20 6e 69 6c 20 69 |stored,.|or nil i|
|000036c0| 66 20 74 68 65 72 65 20 | 69 73 20 6e 6f 6e 65 2e |f there |is none.|
|000036d0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|000036e0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000036f0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00003700| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 61 6e |-local e|merge-an|
|00003710| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 20 70 75 |cestor-b|uffer pu|
|00003720| 74 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 34 |t preser|ved t] 4|
|00003730| 29 0a 28 64 65 66 63 6f | 6e 73 74 20 65 6d 65 72 |).(defco|nst emer|
|00003740| 67 65 2d 73 61 76 65 64 | 2d 76 61 72 69 61 62 6c |ge-saved|-variabl|
|00003750| 65 73 20 28 71 75 6f 74 | 65 20 28 28 62 75 66 66 |es (quot|e ((buff|
|00003760| 65 72 2d 6d 6f 64 69 66 | 69 65 64 2d 70 20 73 65 |er-modif|ied-p se|
|00003770| 74 2d 62 75 66 66 65 72 | 2d 6d 6f 64 69 66 69 65 |t-buffer|-modifie|
|00003780| 64 2d 70 29 20 62 75 66 | 66 65 72 2d 72 65 61 64 |d-p) buf|fer-read|
|00003790| 2d 6f 6e 6c 79 20 62 75 | 66 66 65 72 2d 61 75 74 |-only bu|ffer-aut|
|000037a0| 6f 2d 73 61 76 65 2d 66 | 69 6c 65 2d 6e 61 6d 65 |o-save-f|ile-name|
|000037b0| 29 29 20 22 5c 0a 56 61 | 72 69 61 62 6c 65 73 20 |)) "\.Va|riables |
|000037c0| 61 6e 64 20 70 72 6f 70 | 65 72 74 69 65 73 20 6f |and prop|erties o|
|000037d0| 66 20 61 20 62 75 66 66 | 65 72 20 77 68 69 63 68 |f a buff|er which|
|000037e0| 20 61 72 65 20 73 61 76 | 65 64 2c 20 6d 6f 64 69 | are sav|ed, modi|
|000037f0| 66 69 65 64 20 61 6e 64 | 20 72 65 73 74 6f 72 65 |fied and| restore|
|00003800| 64 0a 64 75 72 69 6e 67 | 20 61 20 6d 65 72 67 65 |d.during| a merge|
|00003810| 2e 22 29 0a 28 64 65 66 | 63 6f 6e 73 74 20 65 6d |.").(def|const em|
|00003820| 65 72 67 65 2d 6d 65 72 | 67 69 6e 67 2d 76 61 6c |erge-mer|ging-val|
|00003830| 75 65 73 20 28 71 75 6f | 74 65 20 28 6e 69 6c 20 |ues (quo|te (nil |
|00003840| 74 20 6e 69 6c 29 29 20 | 22 5c 0a 56 61 6c 75 65 |t nil)) |"\.Value|
|00003850| 73 20 74 6f 20 62 65 20 | 61 73 73 69 67 6e 65 64 |s to be |assigned|
|00003860| 20 74 6f 20 65 6d 65 72 | 67 65 2d 73 61 76 65 64 | to emer|ge-saved|
|00003870| 2d 76 61 72 69 61 62 6c | 65 73 20 64 75 72 69 6e |-variabl|es durin|
|00003880| 67 20 61 20 6d 65 72 67 | 65 2e 22 29 0a 28 64 65 |g a merg|e.").(de|
|00003890| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |fvar eme|rge-A-bu|
|000038a0| 66 66 65 72 2d 76 61 6c | 75 65 73 20 6e 69 6c 20 |ffer-val|ues nil |
|000038b0| 22 5c 0a 52 65 6d 65 6d | 62 65 72 73 20 65 6d 65 |"\.Remem|bers eme|
|000038c0| 72 67 65 2d 73 61 76 65 | 64 2d 76 61 72 69 61 62 |rge-save|d-variab|
|000038d0| 6c 65 73 20 66 6f 72 20 | 65 6d 65 72 67 65 2d 41 |les for |emerge-A|
|000038e0| 2d 62 75 66 66 65 72 2e | 22 29 0a 28 62 79 74 65 |-buffer.|").(byte|
|000038f0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00003900| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00003910| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00003920| 6d 65 72 67 65 2d 41 2d | 62 75 66 66 65 72 2d 76 |merge-A-|buffer-v|
|00003930| 61 6c 75 65 73 20 70 75 | 74 20 70 72 65 73 65 72 |alues pu|t preser|
|00003940| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|00003950| 72 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |r emerge|-B-buffe|
|00003960| 72 2d 76 61 6c 75 65 73 | 20 6e 69 6c 20 22 5c 0a |r-values| nil "\.|
|00003970| 52 65 6d 65 6d 62 65 72 | 73 20 65 6d 65 72 67 65 |Remember|s emerge|
|00003980| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|00003990| 20 66 6f 72 20 65 6d 65 | 72 67 65 2d 42 2d 62 75 | for eme|rge-B-bu|
|000039a0| 66 66 65 72 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |ffer.").|(byte-co|
|000039b0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000039c0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000039d0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|000039e0| 67 65 2d 42 2d 62 75 66 | 66 65 72 2d 76 61 6c 75 |ge-B-buf|fer-valu|
|000039f0| 65 73 20 70 75 74 20 70 | 72 65 73 65 72 76 65 64 |es put p|reserved|
|00003a00| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00003a10| 6d 65 72 67 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |merge-di|fference|
|00003a20| 2d 6c 69 73 74 20 6e 69 | 6c 20 22 5c 0a 56 65 63 |-list ni|l "\.Vec|
|00003a30| 74 6f 72 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |tor of d|ifferenc|
|00003a40| 65 73 20 62 65 74 77 65 | 65 6e 20 74 68 65 20 76 |es betwe|en the v|
|00003a50| 61 72 69 61 6e 74 73 2c | 20 61 6e 64 20 6d 61 72 |ariants,| and mar|
|00003a60| 6b 65 72 73 20 69 6e 20 | 74 68 65 20 62 75 66 66 |kers in |the buff|
|00003a70| 65 72 73 20 74 6f 0a 73 | 68 6f 77 20 77 68 65 72 |ers to.s|how wher|
|00003a80| 65 20 74 68 65 79 20 61 | 72 65 2e 20 20 45 61 63 |e they a|re.  Eac|
|00003a90| 68 20 64 69 66 66 65 72 | 65 6e 63 65 20 69 73 20 |h differ|ence is |
|00003aa0| 72 65 70 72 65 73 65 6e | 74 65 64 20 62 79 20 61 |represen|ted by a|
|00003ab0| 20 76 65 63 74 6f 72 20 | 6f 66 20 73 65 76 65 6e | vector |of seven|
|00003ac0| 0a 65 6c 65 6d 65 6e 74 | 73 2e 20 20 54 68 65 20 |.element|s.  The |
|00003ad0| 66 69 72 73 74 20 74 77 | 6f 20 61 72 65 20 6d 61 |first tw|o are ma|
|00003ae0| 72 6b 65 72 73 20 74 6f | 20 74 68 65 20 62 65 67 |rkers to| the beg|
|00003af0| 69 6e 6e 69 6e 67 20 61 | 6e 64 20 65 6e 64 20 6f |inning a|nd end o|
|00003b00| 66 20 74 68 65 20 64 69 | 66 66 65 72 65 6e 63 65 |f the di|fference|
|00003b10| 0a 73 65 63 74 69 6f 6e | 20 69 6e 20 74 68 65 20 |.section| in the |
|00003b20| 41 20 62 75 66 66 65 72 | 2c 20 74 68 65 20 73 65 |A buffer|, the se|
|00003b30| 63 6f 6e 64 20 74 77 6f | 20 61 72 65 20 6d 61 72 |cond two| are mar|
|00003b40| 6b 65 72 73 20 66 6f 72 | 20 74 68 65 20 42 20 62 |kers for| the B b|
|00003b50| 75 66 66 65 72 2c 20 74 | 68 65 20 74 68 69 72 64 |uffer, t|he third|
|00003b60| 0a 74 77 6f 20 61 72 65 | 20 6d 61 72 6b 65 72 73 |.two are| markers|
|00003b70| 20 66 6f 72 20 74 68 65 | 20 6d 65 72 67 65 20 62 | for the| merge b|
|00003b80| 75 66 66 65 72 2c 20 61 | 6e 64 20 74 68 65 20 6c |uffer, a|nd the l|
|00003b90| 61 73 74 20 65 6c 65 6d | 65 6e 74 20 69 73 20 74 |ast elem|ent is t|
|00003ba0| 68 65 20 5c 22 73 74 61 | 74 65 5c 22 20 6f 66 0a |he \"sta|te\" of.|
|00003bb0| 74 68 61 74 20 64 69 66 | 66 65 72 65 6e 63 65 20 |that dif|ference |
|00003bc0| 69 6e 20 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |in the m|erge buf|
|00003bd0| 66 65 72 2e 0a 20 20 41 | 20 73 65 63 74 69 6f 6e |fer..  A| section|
|00003be0| 20 6f 66 20 61 20 62 75 | 66 66 65 72 20 69 73 20 | of a bu|ffer is |
|00003bf0| 64 65 73 63 72 69 62 65 | 64 20 62 79 20 74 77 6f |describe|d by two|
|00003c00| 20 6d 61 72 6b 65 72 73 | 2c 20 6f 6e 65 20 74 6f | markers|, one to|
|00003c10| 20 74 68 65 20 62 65 67 | 69 6e 6e 69 6e 67 20 6f | the beg|inning o|
|00003c20| 66 0a 74 68 65 20 66 69 | 72 73 74 20 6c 69 6e 65 |f.the fi|rst line|
|00003c30| 20 6f 66 20 74 68 65 20 | 73 65 63 74 69 6f 6e 2c | of the |section,|
|00003c40| 20 61 6e 64 20 6f 6e 65 | 20 74 6f 20 74 68 65 20 | and one| to the |
|00003c50| 62 65 67 69 6e 6e 69 6e | 67 20 6f 66 20 74 68 65 |beginnin|g of the|
|00003c60| 20 66 69 72 73 74 20 6c | 69 6e 65 0a 61 66 74 65 | first l|ine.afte|
|00003c70| 72 20 74 68 65 20 73 65 | 63 74 69 6f 6e 2e 20 20 |r the se|ction.  |
|00003c80| 28 49 66 20 74 68 65 20 | 73 65 63 74 69 6f 6e 20 |(If the |section |
|00003c90| 69 73 20 65 6d 70 74 79 | 2c 20 62 6f 74 68 20 6d |is empty|, both m|
|00003ca0| 61 72 6b 65 72 73 20 70 | 6f 69 6e 74 20 74 6f 20 |arkers p|oint to |
|00003cb0| 74 68 65 20 73 61 6d 65 | 0a 70 6f 69 6e 74 2e 29 |the same|.point.)|
|00003cc0| 20 20 49 66 20 74 68 65 | 20 73 65 63 74 69 6f 6e |  If the| section|
|00003cd0| 20 69 73 20 70 61 72 74 | 20 6f 66 20 74 68 65 20 | is part| of the |
|00003ce0| 73 65 6c 65 63 74 65 64 | 20 64 69 66 66 65 72 65 |selected| differe|
|00003cf0| 6e 63 65 2c 20 74 68 65 | 6e 20 74 68 65 20 6d 61 |nce, the|n the ma|
|00003d00| 72 6b 65 72 73 0a 61 72 | 65 20 6d 6f 76 65 64 20 |rkers.ar|e moved |
|00003d10| 69 6e 74 6f 20 74 68 65 | 20 66 6c 61 67 73 2c 20 |into the| flags, |
|00003d20| 73 6f 20 74 68 65 20 75 | 73 65 72 20 63 61 6e 20 |so the u|ser can |
|00003d30| 65 64 69 74 20 74 68 65 | 20 73 65 63 74 69 6f 6e |edit the| section|
|00003d40| 20 77 69 74 68 6f 75 74 | 20 64 69 73 74 75 72 62 | without| disturb|
|00003d50| 69 6e 67 0a 74 68 65 20 | 6d 61 72 6b 65 72 73 2e |ing.the |markers.|
|00003d60| 0a 20 20 54 68 65 20 5c | 22 73 74 61 74 65 73 5c |.  The \|"states\|
|00003d70| 22 20 61 72 65 3a 0a 09 | 41 09 09 74 68 65 20 6d |" are:..|A..the m|
|00003d80| 65 72 67 65 20 62 75 66 | 66 65 72 20 63 75 72 72 |erge buf|fer curr|
|00003d90| 65 6e 74 6c 79 20 63 6f | 6e 74 61 69 6e 73 20 74 |ently co|ntains t|
|00003da0| 68 65 20 41 20 76 61 72 | 69 61 6e 74 0a 09 42 09 |he A var|iant..B.|
|00003db0| 09 74 68 65 20 6d 65 72 | 67 65 20 62 75 66 66 65 |.the mer|ge buffe|
|00003dc0| 72 20 63 75 72 72 65 6e | 74 6c 79 20 63 6f 6e 74 |r curren|tly cont|
|00003dd0| 61 69 6e 73 20 74 68 65 | 20 42 20 76 61 72 69 61 |ains the| B varia|
|00003de0| 6e 74 0a 09 64 65 66 61 | 75 6c 74 2d 41 09 74 68 |nt..defa|ult-A.th|
|00003df0| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 20 63 |e merge |buffer c|
|00003e00| 6f 6e 74 61 69 6e 73 20 | 74 68 65 20 41 20 76 61 |ontains |the A va|
|00003e10| 72 69 61 6e 74 20 62 79 | 20 64 65 66 61 75 6c 74 |riant by| default|
|00003e20| 2c 0a 09 09 09 62 75 74 | 20 74 68 69 73 20 64 69 |,....but| this di|
|00003e30| 66 66 65 72 65 6e 63 65 | 20 68 61 73 6e 27 74 20 |fference| hasn't |
|00003e40| 62 65 65 6e 20 73 65 6c | 65 63 74 65 64 20 79 65 |been sel|ected ye|
|00003e50| 74 2c 20 73 6f 0a 09 09 | 09 63 68 61 6e 67 65 2d |t, so...|.change-|
|00003e60| 64 65 66 61 75 6c 74 20 | 63 6f 6d 6d 61 6e 64 73 |default |commands|
|00003e70| 20 63 61 6e 20 61 6c 74 | 65 72 20 69 74 0a 09 64 | can alt|er it..d|
|00003e80| 65 66 61 75 6c 74 2d 42 | 09 74 68 65 20 6d 65 72 |efault-B|.the mer|
|00003e90| 67 65 20 62 75 66 66 65 | 72 20 63 6f 6e 74 61 69 |ge buffe|r contai|
|00003ea0| 6e 73 20 74 68 65 20 42 | 20 76 61 72 69 61 6e 74 |ns the B| variant|
|00003eb0| 20 62 79 20 64 65 66 61 | 75 6c 74 2c 0a 09 09 09 | by defa|ult,....|
|00003ec0| 62 75 74 20 74 68 69 73 | 20 64 69 66 66 65 72 65 |but this| differe|
|00003ed0| 6e 63 65 20 68 61 73 6e | 27 74 20 62 65 65 6e 20 |nce hasn|'t been |
|00003ee0| 73 65 6c 65 63 74 65 64 | 20 79 65 74 2c 20 73 6f |selected| yet, so|
|00003ef0| 0a 09 09 09 63 68 61 6e | 67 65 2d 64 65 66 61 75 |....chan|ge-defau|
|00003f00| 6c 74 20 63 6f 6d 6d 61 | 6e 64 73 20 63 61 6e 20 |lt comma|nds can |
|00003f10| 61 6c 74 65 72 20 69 74 | 0a 09 70 72 65 66 65 72 |alter it|..prefer|
|00003f20| 2d 41 09 69 6e 20 61 20 | 74 68 72 65 65 2d 66 69 |-A.in a |three-fi|
|00003f30| 6c 65 20 6d 65 72 67 65 | 2c 20 74 68 65 20 41 20 |le merge|, the A |
|00003f40| 76 61 72 69 61 6e 74 20 | 69 73 20 74 68 65 20 70 |variant |is the p|
|00003f50| 72 65 66 65 72 72 65 64 | 0a 09 09 09 63 68 6f 69 |referred|....choi|
|00003f60| 63 65 0a 09 70 72 65 66 | 65 72 2d 42 09 69 6e 20 |ce..pref|er-B.in |
|00003f70| 61 20 74 68 72 65 65 2d | 66 69 6c 65 20 6d 65 72 |a three-|file mer|
|00003f80| 67 65 2c 20 74 68 65 20 | 42 20 76 61 72 69 61 6e |ge, the |B varian|
|00003f90| 74 20 69 73 20 74 68 65 | 20 70 72 65 66 65 72 72 |t is the| preferr|
|00003fa0| 65 64 0a 09 09 09 63 68 | 6f 69 63 65 22 29 0a 28 |ed....ch|oice").(|
|00003fb0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003fc0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003fd0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003fe0| 61 6c 20 65 6d 65 72 67 | 65 2d 64 69 66 66 65 72 |al emerg|e-differ|
|00003ff0| 65 6e 63 65 2d 6c 69 73 | 74 20 70 75 74 20 70 72 |ence-lis|t put pr|
|00004000| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00004010| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 63 75 72 |efvar em|erge-cur|
|00004020| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|00004030| 2d 31 20 22 5c 0a 54 68 | 65 20 64 69 66 66 65 72 |-1 "\.Th|e differ|
|00004040| 65 6e 63 65 20 74 68 61 | 74 20 69 73 20 63 75 72 |ence tha|t is cur|
|00004050| 72 65 6e 74 6c 79 20 73 | 65 6c 65 63 74 65 64 2e |rently s|elected.|
|00004060| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00004070| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00004080| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00004090| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 63 75 |-local e|merge-cu|
|000040a0| 72 72 65 6e 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |rrent-di|fference|
|000040b0| 20 70 75 74 20 70 72 65 | 73 65 72 76 65 64 20 74 | put pre|served t|
|000040c0| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|000040d0| 72 67 65 2d 6e 75 6d 62 | 65 72 2d 6f 66 2d 64 69 |rge-numb|er-of-di|
|000040e0| 66 66 65 72 65 6e 63 65 | 73 20 6e 69 6c 20 22 5c |fference|s nil "\|
|000040f0| 0a 4e 75 6d 62 65 72 20 | 6f 66 20 64 69 66 66 65 |.Number |of diffe|
|00004100| 72 65 6e 63 65 73 20 66 | 6f 75 6e 64 2e 22 29 0a |rences f|ound.").|
|00004110| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004120| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004130| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004140| 63 61 6c 20 65 6d 65 72 | 67 65 2d 6e 75 6d 62 65 |cal emer|ge-numbe|
|00004150| 72 2d 6f 66 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |r-of-dif|ferences|
|00004160| 20 70 75 74 20 70 72 65 | 73 65 72 76 65 64 20 74 | put pre|served t|
|00004170| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|00004180| 72 67 65 2d 65 64 69 74 | 2d 6b 65 79 6d 61 70 20 |rge-edit|-keymap |
|00004190| 6e 69 6c 20 22 5c 0a 54 | 68 65 20 6c 6f 63 61 6c |nil "\.T|he local|
|000041a0| 20 6b 65 79 6d 61 70 20 | 66 6f 72 20 74 68 65 20 | keymap |for the |
|000041b0| 6d 65 72 67 65 20 62 75 | 66 66 65 72 2c 20 77 69 |merge bu|ffer, wi|
|000041c0| 74 68 20 74 68 65 20 65 | 6d 65 72 67 65 20 63 6f |th the e|merge co|
|000041d0| 6d 6d 61 6e 64 73 20 64 | 65 66 69 6e 65 64 20 69 |mmands d|efined i|
|000041e0| 6e 0a 69 74 2e 20 20 55 | 73 65 64 20 74 6f 20 73 |n.it.  U|sed to s|
|000041f0| 61 76 65 20 74 68 65 20 | 6c 6f 63 61 6c 20 6b 65 |ave the |local ke|
|00004200| 79 6d 61 70 20 64 75 72 | 69 6e 67 20 66 61 73 74 |ymap dur|ing fast|
|00004210| 20 6d 6f 64 65 2c 20 77 | 68 65 6e 20 74 68 65 20 | mode, w|hen the |
|00004220| 6c 6f 63 61 6c 20 6b 65 | 79 6d 61 70 20 69 73 0a |local ke|ymap is.|
|00004230| 72 65 70 6c 61 63 65 64 | 20 62 79 20 65 6d 65 72 |replaced| by emer|
|00004240| 67 65 2d 66 61 73 74 2d | 6b 65 79 6d 61 70 2e 22 |ge-fast-|keymap."|
|00004250| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00004260| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00004270| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00004280| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 65 64 69 |local em|erge-edi|
|00004290| 74 2d 6b 65 79 6d 61 70 | 20 70 75 74 20 70 72 65 |t-keymap| put pre|
|000042a0| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|000042b0| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6f 6c 64 2d |fvar eme|rge-old-|
|000042c0| 6b 65 79 6d 61 70 20 6e | 69 6c 20 22 5c 0a 54 68 |keymap n|il "\.Th|
|000042d0| 65 20 6f 72 69 67 69 6e | 61 6c 20 6c 6f 63 61 6c |e origin|al local|
|000042e0| 20 6b 65 79 6d 61 70 20 | 66 6f 72 20 74 68 65 20 | keymap |for the |
|000042f0| 6d 65 72 67 65 20 62 75 | 66 66 65 72 2e 22 29 0a |merge bu|ffer.").|
|00004300| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004310| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004320| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004330| 63 61 6c 20 65 6d 65 72 | 67 65 2d 6f 6c 64 2d 6b |cal emer|ge-old-k|
|00004340| 65 79 6d 61 70 20 70 75 | 74 20 70 72 65 73 65 72 |eymap pu|t preser|
|00004350| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|00004360| 72 20 65 6d 65 72 67 65 | 2d 61 75 74 6f 2d 61 64 |r emerge|-auto-ad|
|00004370| 76 61 6e 63 65 20 6e 69 | 6c 20 22 5c 0a 2a 49 66 |vance ni|l "\.*If|
|00004380| 20 6e 6f 6e 2d 6e 69 6c | 2c 20 65 6d 65 72 67 65 | non-nil|, emerge|
|00004390| 2d 73 65 6c 65 63 74 2d | 41 20 61 6e 64 20 65 6d |-select-|A and em|
|000043a0| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 42 20 61 75 |erge-sel|ect-B au|
|000043b0| 74 6f 6d 61 74 69 63 61 | 6c 6c 79 20 61 64 76 61 |tomatica|lly adva|
|000043c0| 6e 63 65 20 74 6f 0a 74 | 68 65 20 6e 65 78 74 20 |nce to.t|he next |
|000043d0| 64 69 66 66 65 72 65 6e | 63 65 2e 22 29 0a 28 62 |differen|ce.").(b|
|000043e0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000043f0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00004400| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00004410| 6c 20 65 6d 65 72 67 65 | 2d 61 75 74 6f 2d 61 64 |l emerge|-auto-ad|
|00004420| 76 61 6e 63 65 20 70 75 | 74 20 70 72 65 73 65 72 |vance pu|t preser|
|00004430| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|00004440| 72 20 65 6d 65 72 67 65 | 2d 73 6b 69 70 2d 70 72 |r emerge|-skip-pr|
|00004450| 65 66 65 72 73 20 6e 69 | 6c 20 22 5c 0a 2a 49 66 |efers ni|l "\.*If|
|00004460| 20 6e 6f 6e 2d 6e 69 6c | 2c 20 64 69 66 66 65 72 | non-nil|, differ|
|00004470| 65 6e 63 65 73 20 66 6f | 72 20 77 68 69 63 68 20 |ences fo|r which |
|00004480| 74 68 65 72 65 20 69 73 | 20 61 20 70 72 65 66 65 |there is| a prefe|
|00004490| 72 65 6e 63 65 20 61 72 | 65 20 61 75 74 6f 6d 61 |rence ar|e automa|
|000044a0| 74 69 63 61 6c 6c 79 0a | 73 6b 69 70 70 65 64 2e |tically.|skipped.|
|000044b0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|000044c0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|000044d0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|000044e0| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 73 6b |-local e|merge-sk|
|000044f0| 69 70 2d 70 72 65 66 65 | 72 73 20 70 75 74 20 70 |ip-prefe|rs put p|
|00004500| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00004510| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 71 75 |defvar e|merge-qu|
|00004520| 69 74 2d 68 6f 6f 6b 20 | 6e 69 6c 20 22 5c 0a 48 |it-hook |nil "\.H|
|00004530| 6f 6f 6b 73 20 74 6f 20 | 72 75 6e 20 69 6e 20 74 |ooks to |run in t|
|00004540| 68 65 20 6d 65 72 67 65 | 20 62 75 66 66 65 72 20 |he merge| buffer |
|00004550| 61 66 74 65 72 20 74 68 | 65 20 6d 65 72 67 65 20 |after th|e merge |
|00004560| 68 61 73 20 62 65 65 6e | 20 66 69 6e 69 73 68 65 |has been| finishe|
|00004570| 64 2e 0a 60 65 6d 65 72 | 67 65 2d 70 72 65 66 69 |d..`emer|ge-prefi|
|00004580| 78 2d 61 72 67 75 6d 65 | 6e 74 27 20 77 69 6c 6c |x-argume|nt' will|
|00004590| 20 68 6f 6c 64 20 74 68 | 65 20 70 72 65 66 69 78 | hold th|e prefix|
|000045a0| 20 61 72 67 75 6d 65 6e | 74 20 6f 66 20 74 68 65 | argumen|t of the|
|000045b0| 20 60 65 6d 65 72 67 65 | 2d 71 75 69 74 27 0a 63 | `emerge|-quit'.c|
|000045c0| 6f 6d 6d 61 6e 64 2e 0a | 54 68 69 73 20 69 73 20 |ommand..|This is |
|000045d0| 2a 6e 6f 74 2a 20 61 20 | 75 73 65 72 20 6f 70 74 |*not* a |user opt|
|000045e0| 69 6f 6e 2c 20 73 69 6e | 63 65 20 45 6d 65 72 67 |ion, sin|ce Emerg|
|000045f0| 65 20 75 73 65 73 20 69 | 74 20 66 6f 72 20 69 74 |e uses i|t for it|
|00004600| 73 20 6f 77 6e 20 70 72 | 6f 63 65 73 73 69 6e 67 |s own pr|ocessing|
|00004610| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00004620| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00004630| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00004640| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 71 |r-local |emerge-q|
|00004650| 75 69 74 2d 68 6f 6f 6b | 20 70 75 74 20 70 72 65 |uit-hook| put pre|
|00004660| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|00004670| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6f 75 74 70 |fvar eme|rge-outp|
|00004680| 75 74 2d 64 65 73 63 72 | 69 70 74 69 6f 6e 20 6e |ut-descr|iption n|
|00004690| 69 6c 20 22 5c 0a 44 65 | 73 63 72 69 62 65 73 20 |il "\.De|scribes |
|000046a0| 6f 75 74 70 75 74 20 64 | 65 73 74 69 6e 61 74 69 |output d|estinati|
|000046b0| 6f 6e 20 6f 66 20 65 6d | 65 72 67 65 2c 20 66 6f |on of em|erge, fo|
|000046c0| 72 20 60 65 6d 65 72 67 | 65 2d 66 69 6c 65 2d 6e |r `emerg|e-file-n|
|000046d0| 61 6d 65 73 27 2e 22 29 | 0a 28 62 79 74 65 2d 63 |ames'.")|.(byte-c|
|000046e0| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 88 c5 |ode "..!|.....#..|
|000046f0| c6 c7 5c 22 88 c5 c8 c9 | 5c 22 88 c5 ca cb 5c 22 |..\"....|\"....\"|
|00004700| 88 c5 cc cd 5c 22 88 c5 | ce cf 5c 22 88 c5 d0 d1 |....\"..|..\"....|
|00004710| 5c 22 88 c5 d2 d3 5c 22 | 88 c5 d4 d5 5c 22 88 c5 |\"....\"|....\"..|
|00004720| d6 d7 5c 22 88 c5 d8 d9 | 5c 22 87 22 20 5b 6d 61 |..\"....|\"." [ma|
|00004730| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004740| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00004750| 6f 75 74 70 75 74 2d 64 | 65 73 63 72 69 70 74 69 |output-d|escripti|
|00004760| 6f 6e 20 70 75 74 20 70 | 72 65 73 65 72 76 65 64 |on put p|reserved|
|00004770| 20 74 20 64 65 66 61 6c | 69 61 73 20 65 6d 65 72 | t defal|ias emer|
|00004780| 67 65 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ge-files|-interna|
|00004790| 6c 20 23 5b 28 66 69 6c | 65 2d 41 20 66 69 6c 65 |l #[(fil|e-A file|
|000047a0| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|000047b0| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|000047c0| 68 6f 6f 6b 73 20 6f 75 | 74 70 75 74 2d 66 69 6c |hooks ou|tput-fil|
|000047d0| 65 29 20 22 c0 09 21 84 | 0b 00 c2 c3 09 5c 22 88 |e) "..!.|.....\".|
|000047e0| c0 5c 66 21 84 16 00 c2 | c3 5c 66 5c 22 88 c5 09 |.\f!....|.\f\"...|
|000047f0| 21 c5 5c 66 21 1e 06 1e | 07 c8 09 21 16 09 c8 5c |!.\f!...|...!...\|
|00004800| 66 21 16 5c 6e 0e 0b 83 | 35 00 c8 0e 0b 21 16 5c |f!.\n...|5....!.\|
|00004810| 66 70 1e 0d ce 8e 0e 07 | 71 88 7e 88 cf 09 21 89 |fp......|q.~...!.|
|00004820| 1e 10 83 5a 00 0e 10 11 | d1 d2 d3 09 44 45 0e 14 |...Z....|....DE..|
|00004830| 42 16 14 82 5d 00 d5 20 | 88 2b 70 1e 0d d6 8e 0e |B...].. |.+p.....|
|00004840| 06 71 88 7e 88 cf 5c 66 | 21 89 1e 10 83 83 00 0e |.q.~..\f|!.......|
|00004850| 10 14 d1 d2 d3 5c 66 44 | 45 0e 14 42 16 14 82 86 |.....\fD|E..B....|
|00004860| 00 d5 20 88 2b d7 0e 07 | 09 0e 06 5c 66 0e 14 0e |.. .+...|...\f...|
|00004870| 18 0e 0b 26 07 2a 87 22 | 20 5b 66 69 6c 65 2d 72 |...&.*."| [file-r|
|00004880| 65 61 64 61 62 6c 65 2d | 70 20 66 69 6c 65 2d 41 |eadable-|p file-A|
|00004890| 20 65 72 72 6f 72 20 22 | 46 69 6c 65 20 60 25 73 | error "|File `%s|
|000048a0| 27 20 64 6f 65 73 20 6e | 6f 74 20 65 78 69 73 74 |' does n|ot exist|
|000048b0| 20 6f 72 20 69 73 20 6e | 6f 74 20 72 65 61 64 61 | or is n|ot reada|
|000048c0| 62 6c 65 22 20 66 69 6c | 65 2d 42 20 66 69 6e 64 |ble" fil|e-B find|
|000048d0| 2d 66 69 6c 65 2d 6e 6f | 73 65 6c 65 63 74 20 62 |-file-no|select b|
|000048e0| 75 66 66 65 72 2d 42 20 | 62 75 66 66 65 72 2d 41 |uffer-B |buffer-A|
|000048f0| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 64 69 72 65 63 | file-na|me-direc|
|00004900| 74 6f 72 79 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |tory eme|rge-last|
|00004910| 2d 64 69 72 2d 41 20 65 | 6d 65 72 67 65 2d 6c 61 |-dir-A e|merge-la|
|00004920| 73 74 2d 64 69 72 2d 42 | 20 6f 75 74 70 75 74 2d |st-dir-B| output-|
|00004930| 66 69 6c 65 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |file eme|rge-last|
|00004940| 2d 64 69 72 2d 6f 75 74 | 70 75 74 20 53 74 61 72 |-dir-out|put Star|
|00004950| 74 42 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |tBuffer |((set-bu|
|00004960| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004970| 29 29 20 66 69 6c 65 2d | 6c 6f 63 61 6c 2d 63 6f |)) file-|local-co|
|00004980| 70 79 20 74 65 6d 70 20 | 6c 61 6d 62 64 61 20 6e |py temp |lambda n|
|00004990| 69 6c 20 64 65 6c 65 74 | 65 2d 66 69 6c 65 20 73 |il delet|e-file s|
|000049a0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 6d 65 |tartup-h|ooks eme|
|000049b0| 72 67 65 2d 76 65 72 69 | 66 79 2d 66 69 6c 65 2d |rge-veri|fy-file-|
|000049c0| 62 75 66 66 65 72 20 28 | 28 73 65 74 2d 62 75 66 |buffer (|(set-buf|
|000049d0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000049e0| 29 20 65 6d 65 72 67 65 | 2d 73 65 74 75 70 20 71 |) emerge|-setup q|
|000049f0| 75 69 74 2d 68 6f 6f 6b | 73 5d 20 39 5d 20 65 6d |uit-hook|s] 9] em|
|00004a00| 65 72 67 65 2d 73 65 74 | 75 70 20 23 5b 28 62 75 |erge-set|up #[(bu|
|00004a10| 66 66 65 72 2d 41 20 66 | 69 6c 65 2d 41 20 62 75 |ffer-A f|ile-A bu|
|00004a20| 66 66 65 72 2d 42 20 66 | 69 6c 65 2d 42 20 73 74 |ffer-B f|ile-B st|
|00004a30| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 71 75 69 74 |artup-ho|oks quit|
|00004a40| 2d 68 6f 6f 6b 73 20 6f | 75 74 70 75 74 2d 66 69 |-hooks o|utput-fi|
|00004a50| 6c 65 29 20 22 c0 09 21 | 11 c0 5c 6e 21 12 0b 85 |le) "..!|..\n!...|
|00004a60| 0f 00 c0 0b 21 13 c4 c5 | c6 5c 22 1e 07 70 1e 08 |....!...|.\"..p..|
|00004a70| c9 8e 0e 5c 6e 71 88 cb | 0e 07 21 2a 1e 5c 66 70 |...\nq..|..!*.\fp|
|00004a80| 1e 08 cd 8e 0e 5c 66 71 | 88 ce 0e 5c 6e 21 88 cf |.....\fq|...\n!..|
|00004a90| 16 10 d1 d2 21 88 d3 16 | 14 0e 5c 6e 16 15 0e 16 |....!...|..\n....|
|00004aa0| 16 17 cf 16 18 0e 5c 66 | 16 19 0b 83 57 00 da 0b |......\f|....W...|
|00004ab0| 50 82 5d 00 db dc 0e 5c | 66 21 50 16 1d de 0e 15 |P.]....\|f!P.....|
|00004ac0| 21 88 df 20 88 e0 09 5c | 6e 5c 22 89 16 21 47 16 |!.. ...\|n\"..!G.|
|00004ad0| 5c 22 e3 16 24 0e 25 16 | 26 e7 20 88 e8 20 88 2a |\"..$.%.|&. .. .*|
|00004ae0| e9 0e 5c 6e 0e 16 0e 5c | 66 d3 24 88 70 1e 08 ea |..\n...\|f.$.p...|
|00004af0| 8e 0e 5c 66 71 88 eb ec | ed 5c 22 88 d3 89 16 10 |..\fq...|.\".....|
|00004b00| 2c 87 22 20 5b 65 78 70 | 61 6e 64 2d 66 69 6c 65 |,." [exp|and-file|
|00004b10| 2d 6e 61 6d 65 20 66 69 | 6c 65 2d 41 20 66 69 6c |-name fi|le-A fil|
|00004b20| 65 2d 42 20 6f 75 74 70 | 75 74 2d 66 69 6c 65 20 |e-B outp|ut-file |
|00004b30| 65 6d 65 72 67 65 2d 75 | 6e 69 71 75 65 2d 62 75 |emerge-u|nique-bu|
|00004b40| 66 66 65 72 2d 6e 61 6d | 65 20 22 2a 6d 65 72 67 |ffer-nam|e "*merg|
|00004b50| 65 22 20 22 2a 22 20 6d | 65 72 67 65 2d 62 75 66 |e" "*" m|erge-buf|
|00004b60| 66 65 72 2d 6e 61 6d 65 | 20 53 74 61 72 74 42 75 |fer-name| StartBu|
|00004b70| 66 66 65 72 20 28 28 73 | 65 74 2d 62 75 66 66 65 |ffer ((s|et-buffe|
|00004b80| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004b90| 62 75 66 66 65 72 2d 41 | 20 67 65 74 2d 62 75 66 |buffer-A| get-buf|
|00004ba0| 66 65 72 2d 63 72 65 61 | 74 65 20 6d 65 72 67 65 |fer-crea|te merge|
|00004bb0| 2d 62 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |-buffer |((set-bu|
|00004bc0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004bd0| 29 29 20 65 6d 65 72 67 | 65 2d 63 6f 70 79 2d 6d |)) emerg|e-copy-m|
|00004be0| 6f 64 65 73 20 6e 69 6c | 20 62 75 66 66 65 72 2d |odes nil| buffer-|
|00004bf0| 72 65 61 64 2d 6f 6e 6c | 79 20 61 75 74 6f 2d 73 |read-onl|y auto-s|
|00004c00| 61 76 65 2d 6d 6f 64 65 | 20 31 20 74 20 65 6d 65 |ave-mode| 1 t eme|
|00004c10| 72 67 65 2d 6d 6f 64 65 | 20 65 6d 65 72 67 65 2d |rge-mode| emerge-|
|00004c20| 41 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |A-buffer| buffer-|
|00004c30| 42 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |B emerge|-B-buffe|
|00004c40| 72 20 65 6d 65 72 67 65 | 2d 61 6e 63 65 73 74 6f |r emerge|-ancesto|
|00004c50| 72 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |r-buffer| emerge-|
|00004c60| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 20 22 4f 75 |merge-bu|ffer "Ou|
|00004c70| 74 70 75 74 20 74 6f 20 | 66 69 6c 65 3a 20 22 20 |tput to |file: " |
|00004c80| 22 4f 75 74 70 75 74 20 | 74 6f 20 62 75 66 66 65 |"Output |to buffe|
|00004c90| 72 3a 20 22 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |r: " buf|fer-name|
|00004ca0| 20 65 6d 65 72 67 65 2d | 6f 75 74 70 75 74 2d 64 | emerge-|output-d|
|00004cb0| 65 73 63 72 69 70 74 69 | 6f 6e 20 69 6e 73 65 72 |escripti|on inser|
|00004cc0| 74 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |t-buffer| emerge-|
|00004cd0| 73 65 74 2d 6b 65 79 73 | 20 65 6d 65 72 67 65 2d |set-keys| emerge-|
|00004ce0| 6d 61 6b 65 2d 64 69 66 | 66 2d 6c 69 73 74 20 65 |make-dif|f-list e|
|00004cf0| 6d 65 72 67 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |merge-di|fference|
|00004d00| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 6e 75 6d |-list em|erge-num|
|00004d10| 62 65 72 2d 6f 66 2d 64 | 69 66 66 65 72 65 6e 63 |ber-of-d|ifferenc|
|00004d20| 65 73 20 2d 31 20 65 6d | 65 72 67 65 2d 63 75 72 |es -1 em|erge-cur|
|00004d30| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|00004d40| 71 75 69 74 2d 68 6f 6f | 6b 73 20 65 6d 65 72 67 |quit-hoo|ks emerg|
|00004d50| 65 2d 71 75 69 74 2d 68 | 6f 6f 6b 20 65 6d 65 72 |e-quit-h|ook emer|
|00004d60| 67 65 2d 72 65 6d 65 6d | 62 65 72 2d 62 75 66 66 |ge-remem|ber-buff|
|00004d70| 65 72 2d 63 68 61 72 61 | 63 74 65 72 69 73 74 69 |er-chara|cteristi|
|00004d80| 63 73 20 65 6d 65 72 67 | 65 2d 68 61 6e 64 6c 65 |cs emerg|e-handle|
|00004d90| 2d 6c 6f 63 61 6c 2d 76 | 61 72 69 61 62 6c 65 73 |-local-v|ariables|
|00004da0| 20 65 6d 65 72 67 65 2d | 73 65 74 75 70 2d 77 69 | emerge-|setup-wi|
|00004db0| 6e 64 6f 77 73 20 28 28 | 73 65 74 2d 62 75 66 66 |ndows ((|set-buff|
|00004dc0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004dd0| 20 72 75 6e 2d 68 6f 6f | 6b 73 20 73 74 61 72 74 | run-hoo|ks start|
|00004de0| 75 70 2d 68 6f 6f 6b 73 | 20 65 6d 65 72 67 65 2d |up-hooks| emerge-|
|00004df0| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 5d 20 36 5d |startup-|hook] 6]|
|00004e00| 20 65 6d 65 72 67 65 2d | 6d 61 6b 65 2d 64 69 66 | emerge-|make-dif|
|00004e10| 66 2d 6c 69 73 74 20 23 | 5b 28 66 69 6c 65 2d 41 |f-list #|[(file-A|
|00004e20| 20 66 69 6c 65 2d 42 29 | 20 22 c0 c1 21 12 70 1b | file-B)| "..!.p.|
|00004e30| c4 8e 5c 6e 71 88 c5 20 | 88 c6 c7 c8 0e 09 0e 5c |..\nq.. |.......\|
|00004e40| 6e cb 0e 5c 66 21 cb 0e | 0d 21 25 ce 5c 22 88 2a |n..\f!..|.!%.\".*|
|00004e50| cf 0e 10 21 88 d1 0e 12 | 0e 13 0e 14 d5 5c 6e 21 |...!....|.....\n!|
|00004e60| 24 87 22 20 5b 67 65 74 | 2d 62 75 66 66 65 72 2d |$." [get|-buffer-|
|00004e70| 63 72 65 61 74 65 20 22 | 2a 65 6d 65 72 67 65 2d |create "|*emerge-|
|00004e80| 64 69 66 66 2a 22 20 65 | 6d 65 72 67 65 2d 64 69 |diff*" e|merge-di|
|00004e90| 66 66 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |ff-buffe|r StartB|
|00004ea0| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00004eb0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004ec0| 20 65 72 61 73 65 2d 62 | 75 66 66 65 72 20 73 68 | erase-b|uffer sh|
|00004ed0| 65 6c 6c 2d 63 6f 6d 6d | 61 6e 64 20 66 6f 72 6d |ell-comm|and form|
|00004ee0| 61 74 20 22 25 73 20 25 | 73 20 25 73 20 25 73 22 |at "%s %|s %s %s"|
|00004ef0| 20 65 6d 65 72 67 65 2d | 64 69 66 66 2d 70 72 6f | emerge-|diff-pro|
|00004f00| 67 72 61 6d 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |gram eme|rge-diff|
|00004f10| 2d 6f 70 74 69 6f 6e 73 | 20 65 6d 65 72 67 65 2d |-options| emerge-|
|00004f20| 70 72 6f 74 65 63 74 2d | 6d 65 74 61 63 68 61 72 |protect-|metachar|
|00004f30| 73 20 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 42 20 |s file-A| file-B |
|00004f40| 74 20 65 6d 65 72 67 65 | 2d 70 72 65 70 61 72 65 |t emerge|-prepare|
|00004f50| 2d 65 72 72 6f 72 2d 6c | 69 73 74 20 65 6d 65 72 |-error-l|ist emer|
|00004f60| 67 65 2d 64 69 66 66 2d | 6f 6b 2d 6c 69 6e 65 73 |ge-diff-|ok-lines|
|00004f70| 2d 72 65 67 65 78 70 20 | 65 6d 65 72 67 65 2d 63 |-regexp |emerge-c|
|00004f80| 6f 6e 76 65 72 74 2d 64 | 69 66 66 73 2d 74 6f 2d |onvert-d|iffs-to-|
|00004f90| 6d 61 72 6b 65 72 73 20 | 65 6d 65 72 67 65 2d 41 |markers |emerge-A|
|00004fa0| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 42 |-buffer |emerge-B|
|00004fb0| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 6d |-buffer |emerge-m|
|00004fc0| 65 72 67 65 2d 62 75 66 | 66 65 72 20 65 6d 65 72 |erge-buf|fer emer|
|00004fd0| 67 65 2d 65 78 74 72 61 | 63 74 2d 64 69 66 66 73 |ge-extra|ct-diffs|
|00004fe0| 5d 20 38 5d 20 65 6d 65 | 72 67 65 2d 65 78 74 72 |] 8] eme|rge-extr|
|00004ff0| 61 63 74 2d 64 69 66 66 | 73 20 23 5b 28 64 69 66 |act-diff|s #[(dif|
|00005000| 66 2d 62 75 66 66 65 72 | 29 20 22 c0 19 70 1a c3 |f-buffer|) "..p..|
|00005010| 8e 5c 66 71 88 65 62 88 | c5 0e 06 c0 c7 23 83 ae |.\fq.eb.|.....#..|
|00005020| 00 c8 c9 94 c9 95 7b 21 | 1e 5c 6e cb 94 cb 95 1e |......{!|.\n.....|
|00005030| 5c 66 89 1e 0d 83 34 00 | c8 0e 0d 0e 5c 66 7b 21 |\f....4.|....\f{!|
|00005040| 82 36 00 0e 5c 6e 2a 1e | 0e cf 94 cf 95 7b 1e 10 |.6..\n*.|.....{..|
|00005050| c8 d1 94 d1 95 7b 21 1e | 12 d3 94 d3 95 1e 5c 66 |.....{!.|......\f|
|00005060| 89 1e 0d 83 5f 00 c8 0e | 0d 0e 5c 66 7b 21 82 61 |...._...|..\f{!.a|
|00005070| 00 0e 12 2a 1e 14 0e 10 | d5 98 83 7b 00 0e 14 54 |...*....|...{...T|
|00005080| 16 14 0e 5c 6e 54 89 16 | 5c 6e 16 0e 82 9c 00 0e |...\nT..|\n......|
|00005090| 10 d6 98 83 92 00 0e 0e | 54 16 0e 0e 12 54 89 16 |........|T....T..|
|000050a0| 12 16 14 82 9c 00 0e 0e | 54 16 0e 0e 14 54 16 14 |........|T....T..|
|000050b0| d7 0e 5c 6e 0e 0e 0e 12 | 0e 14 d8 25 09 42 11 2d |..\n....|...%.B.-|
|000050c0| 82 5c 66 00 2a 09 9f 29 | 87 22 20 5b 6e 69 6c 20 |.\f.*..)|." [nil |
|000050d0| 6c 69 73 74 20 53 74 61 | 72 74 42 75 66 66 65 72 |list Sta|rtBuffer|
|000050e0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000050f0| 61 72 74 42 75 66 66 65 | 72 29 29 20 64 69 66 66 |artBuffe|r)) diff|
|00005100| 2d 62 75 66 66 65 72 20 | 72 65 2d 73 65 61 72 63 |-buffer |re-searc|
|00005110| 68 2d 66 6f 72 77 61 72 | 64 20 65 6d 65 72 67 65 |h-forwar|d emerge|
|00005120| 2d 6d 61 74 63 68 2d 64 | 69 66 66 2d 6c 69 6e 65 |-match-d|iff-line|
|00005130| 20 74 20 73 74 72 69 6e | 67 2d 74 6f 2d 69 6e 74 | t strin|g-to-int|
|00005140| 20 31 20 61 2d 62 65 67 | 69 6e 20 33 20 65 20 62 | 1 a-beg|in 3 e b|
|00005150| 20 61 2d 65 6e 64 20 34 | 20 64 69 66 66 2d 74 79 | a-end 4| diff-ty|
|00005160| 70 65 20 35 20 62 2d 62 | 65 67 69 6e 20 37 20 62 |pe 5 b-b|egin 7 b|
|00005170| 2d 65 6e 64 20 22 61 22 | 20 22 64 22 20 76 65 63 |-end "a"| "d" vec|
|00005180| 74 6f 72 20 64 65 66 61 | 75 6c 74 2d 41 5d 20 37 |tor defa|ult-A] 7|
|00005190| 5d 20 65 6d 65 72 67 65 | 2d 70 72 65 70 61 72 65 |] emerge|-prepare|
|000051a0| 2d 65 72 72 6f 72 2d 6c | 69 73 74 20 23 5b 28 6f |-error-l|ist #[(o|
|000051b0| 6b 2d 72 65 67 65 78 70 | 29 20 22 c0 c1 21 12 70 |k-regexp|) "..!.p|
|000051c0| 1b c4 8e 5c 6e 71 88 c5 | 20 88 c6 0e 07 21 88 c8 |...\nq..| ....!..|
|000051d0| 0e 09 21 2a 87 22 20 5b | 67 65 74 2d 62 75 66 66 |..!*." [|get-buff|
|000051e0| 65 72 2d 63 72 65 61 74 | 65 20 22 2a 65 6d 65 72 |er-creat|e "*emer|
|000051f0| 67 65 2d 64 69 66 66 2d | 65 72 72 6f 72 73 2a 22 |ge-diff-|errors*"|
|00005200| 20 65 6d 65 72 67 65 2d | 64 69 66 66 2d 65 72 72 | emerge-|diff-err|
|00005210| 6f 72 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |or-buffe|r StartB|
|00005220| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00005230| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00005240| 20 65 72 61 73 65 2d 62 | 75 66 66 65 72 20 69 6e | erase-b|uffer in|
|00005250| 73 65 72 74 2d 62 75 66 | 66 65 72 20 65 6d 65 72 |sert-buf|fer emer|
|00005260| 67 65 2d 64 69 66 66 2d | 62 75 66 66 65 72 20 64 |ge-diff-|buffer d|
|00005270| 65 6c 65 74 65 2d 6d 61 | 74 63 68 69 6e 67 2d 6c |elete-ma|tching-l|
|00005280| 69 6e 65 73 20 6f 6b 2d | 72 65 67 65 78 70 5d 20 |ines ok-|regexp] |
|00005290| 32 5d 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |2] emerg|e-files-|
|000052a0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 2d 69 6e |with-anc|estor-in|
|000052b0| 74 65 72 6e 61 6c 20 23 | 5b 28 66 69 6c 65 2d 41 |ternal #|[(file-A|
|000052c0| 20 66 69 6c 65 2d 42 20 | 66 69 6c 65 2d 61 6e 63 | file-B |file-anc|
|000052d0| 65 73 74 6f 72 20 26 6f | 70 74 69 6f 6e 61 6c 20 |estor &o|ptional |
|000052e0| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 71 75 |startup-|hooks qu|
|000052f0| 69 74 2d 68 6f 6f 6b 73 | 20 6f 75 74 70 75 74 2d |it-hooks| output-|
|00005300| 66 69 6c 65 29 20 22 c0 | 09 21 84 0b 00 c2 c3 09 |file) ".|.!......|
|00005310| 5c 22 88 c0 5c 66 21 84 | 16 00 c2 c3 5c 66 5c 22 |\"..\f!.|....\f\"|
|00005320| 88 c0 0d 21 84 21 00 c2 | c3 0d 5c 22 88 c6 09 21 |...!.!..|..\"...!|
|00005330| c6 5c 66 21 c6 0d 21 1e | 07 1e 08 1e 09 ca 09 21 |.\f!..!.|.......!|
|00005340| 16 0b ca 5c 66 21 16 5c | 66 ca 0d 21 16 0d 0e 0e |...\f!.\|f..!....|
|00005350| 83 4a 00 ca 0e 0e 21 16 | 0f 70 1e 10 d1 8e 0e 09 |.J....!.|.p......|
|00005360| 71 88 7e 88 d2 09 21 89 | 1e 13 83 6f 00 0e 13 11 |q.~...!.|...o....|
|00005370| d4 d5 d6 09 44 45 0e 17 | 42 16 17 82 72 00 d8 20 |....DE..|B...r.. |
|00005380| 88 2b 70 1e 10 d9 8e 0e | 08 71 88 7e 88 d2 5c 66 |.+p.....|.q.~..\f|
|00005390| 21 89 1e 13 83 98 00 0e | 13 14 d4 d5 d6 5c 66 44 |!.......|.....\fD|
|000053a0| 45 0e 17 42 16 17 82 9b | 00 d8 20 88 2b 70 1e 10 |E..B....|.. .+p..|
|000053b0| da 8e 0e 07 71 88 7e 88 | d2 0d 21 89 1e 13 83 c1 |....q.~.|..!.....|
|000053c0| 00 0e 13 15 d4 d5 d6 0d | 44 45 0e 17 42 16 17 82 |........|DE..B...|
|000053d0| c4 00 d8 20 88 2b db 0e | 09 09 0e 08 5c 66 0e 07 |... .+..|....\f..|
|000053e0| 0d 0e 17 0e 1c 0e 0e 26 | 09 2b 87 22 20 5b 66 69 |.......&|.+." [fi|
|000053f0| 6c 65 2d 72 65 61 64 61 | 62 6c 65 2d 70 20 66 69 |le-reada|ble-p fi|
|00005400| 6c 65 2d 41 20 65 72 72 | 6f 72 20 22 46 69 6c 65 |le-A err|or "File|
|00005410| 20 60 25 73 27 20 64 6f | 65 73 20 6e 6f 74 20 65 | `%s' do|es not e|
|00005420| 78 69 73 74 20 6f 72 20 | 69 73 20 6e 6f 74 20 72 |xist or |is not r|
|00005430| 65 61 64 61 62 6c 65 22 | 20 66 69 6c 65 2d 42 20 |eadable"| file-B |
|00005440| 66 69 6c 65 2d 61 6e 63 | 65 73 74 6f 72 20 66 69 |file-anc|estor fi|
|00005450| 6e 64 2d 66 69 6c 65 2d | 6e 6f 73 65 6c 65 63 74 |nd-file-|noselect|
|00005460| 20 62 75 66 66 65 72 2d | 61 6e 63 65 73 74 6f 72 | buffer-|ancestor|
|00005470| 20 62 75 66 66 65 72 2d | 42 20 62 75 66 66 65 72 | buffer-|B buffer|
|00005480| 2d 41 20 66 69 6c 65 2d | 6e 61 6d 65 2d 64 69 72 |-A file-|name-dir|
|00005490| 65 63 74 6f 72 79 20 65 | 6d 65 72 67 65 2d 6c 61 |ectory e|merge-la|
|000054a0| 73 74 2d 64 69 72 2d 41 | 20 65 6d 65 72 67 65 2d |st-dir-A| emerge-|
|000054b0| 6c 61 73 74 2d 64 69 72 | 2d 42 20 65 6d 65 72 67 |last-dir|-B emerg|
|000054c0| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 61 6e 63 65 73 |e-last-d|ir-ances|
|000054d0| 74 6f 72 20 6f 75 74 70 | 75 74 2d 66 69 6c 65 20 |tor outp|ut-file |
|000054e0| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|000054f0| 6f 75 74 70 75 74 20 53 | 74 61 72 74 42 75 66 66 |output S|tartBuff|
|00005500| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00005510| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 66 69 |StartBuf|fer)) fi|
|00005520| 6c 65 2d 6c 6f 63 61 6c | 2d 63 6f 70 79 20 74 65 |le-local|-copy te|
|00005530| 6d 70 20 6c 61 6d 62 64 | 61 20 6e 69 6c 20 64 65 |mp lambd|a nil de|
|00005540| 6c 65 74 65 2d 66 69 6c | 65 20 73 74 61 72 74 75 |lete-fil|e startu|
|00005550| 70 2d 68 6f 6f 6b 73 20 | 65 6d 65 72 67 65 2d 76 |p-hooks |emerge-v|
|00005560| 65 72 69 66 79 2d 66 69 | 6c 65 2d 62 75 66 66 65 |erify-fi|le-buffe|
|00005570| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00005580| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 28 28 73 |tartBuff|er)) ((s|
|00005590| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|000055a0| 75 66 66 65 72 29 29 20 | 65 6d 65 72 67 65 2d 73 |uffer)) |emerge-s|
|000055b0| 65 74 75 70 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |etup-wit|h-ancest|
|000055c0| 6f 72 20 71 75 69 74 2d | 68 6f 6f 6b 73 5d 20 31 |or quit-|hooks] 1|
|000055d0| 31 5d 20 65 6d 65 72 67 | 65 2d 73 65 74 75 70 2d |1] emerg|e-setup-|
|000055e0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 23 5b |with-anc|estor #[|
|000055f0| 28 62 75 66 66 65 72 2d | 41 20 66 69 6c 65 2d 41 |(buffer-|A file-A|
|00005600| 20 62 75 66 66 65 72 2d | 42 20 66 69 6c 65 2d 42 | buffer-|B file-B|
|00005610| 20 62 75 66 66 65 72 2d | 61 6e 63 65 73 74 6f 72 | buffer-|ancestor|
|00005620| 20 66 69 6c 65 2d 61 6e | 63 65 73 74 6f 72 20 26 | file-an|cestor &|
|00005630| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00005640| 2d 68 6f 6f 6b 73 20 71 | 75 69 74 2d 68 6f 6f 6b |-hooks q|uit-hook|
|00005650| 73 20 6f 75 74 70 75 74 | 2d 66 69 6c 65 29 20 22 |s output|-file) "|
|00005660| c0 09 21 11 c0 5c 6e 21 | 12 c0 0b 21 13 5c 66 85 |..!..\n!|...!.\f.|
|00005670| 13 00 c0 5c 66 21 14 c5 | c6 c7 5c 22 1e 08 70 1e |...\f!..|..\"..p.|
|00005680| 09 ca 8e 0e 0b 71 88 cc | 0e 08 21 2a 1e 0d 70 1e |.....q..|..!*..p.|
|00005690| 09 ce 8e 0e 0d 71 88 cf | 0e 0b 21 88 d0 16 11 d2 |.....q..|..!.....|
|000056a0| d3 21 88 d4 16 15 0e 0b | 16 16 0e 17 16 18 0e 19 |.!......|........|
|000056b0| 16 1a 0e 0d 16 1b 5c 66 | 83 5c 5c 00 dc 5c 66 50 |......\f|.\\..\fP|
|000056c0| 82 62 00 dd de 0e 0d 21 | 50 16 1f e0 0e 16 21 88 |.b.....!|P.....!.|
|000056d0| e1 20 88 e2 09 5c 6e 0b | 23 89 16 23 47 16 24 e5 |. ...\n.|#..#G.$.|
|000056e0| 16 26 0e 27 16 28 e9 20 | 88 ea 20 88 eb 20 88 2a |.&.'.(. |.. .. .*|
|000056f0| ec 0e 0b 0e 17 0e 0d d4 | 24 88 70 1e 09 ed 8e 0e |........|$.p.....|
|00005700| 0d 71 88 ee ef f0 5c 22 | 88 d4 89 16 11 2c 87 22 |.q....\"|.....,."|
|00005710| 20 5b 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 | [expand|-file-na|
|00005720| 6d 65 20 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |me file-|A file-B|
|00005730| 20 66 69 6c 65 2d 61 6e | 63 65 73 74 6f 72 20 6f | file-an|cestor o|
|00005740| 75 74 70 75 74 2d 66 69 | 6c 65 20 65 6d 65 72 67 |utput-fi|le emerg|
|00005750| 65 2d 75 6e 69 71 75 65 | 2d 62 75 66 66 65 72 2d |e-unique|-buffer-|
|00005760| 6e 61 6d 65 20 22 2a 6d | 65 72 67 65 22 20 22 2a |name "*m|erge" "*|
|00005770| 22 20 6d 65 72 67 65 2d | 62 75 66 66 65 72 2d 6e |" merge-|buffer-n|
|00005780| 61 6d 65 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |ame Star|tBuffer |
|00005790| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000057a0| 72 74 42 75 66 66 65 72 | 29 29 20 62 75 66 66 65 |rtBuffer|)) buffe|
|000057b0| 72 2d 41 20 67 65 74 2d | 62 75 66 66 65 72 2d 63 |r-A get-|buffer-c|
|000057c0| 72 65 61 74 65 20 6d 65 | 72 67 65 2d 62 75 66 66 |reate me|rge-buff|
|000057d0| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|000057e0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 6d |StartBuf|fer)) em|
|000057f0| 65 72 67 65 2d 63 6f 70 | 79 2d 6d 6f 64 65 73 20 |erge-cop|y-modes |
|00005800| 6e 69 6c 20 62 75 66 66 | 65 72 2d 72 65 61 64 2d |nil buff|er-read-|
|00005810| 6f 6e 6c 79 20 61 75 74 | 6f 2d 73 61 76 65 2d 6d |only aut|o-save-m|
|00005820| 6f 64 65 20 31 20 74 20 | 65 6d 65 72 67 65 2d 6d |ode 1 t |emerge-m|
|00005830| 6f 64 65 20 65 6d 65 72 | 67 65 2d 41 2d 62 75 66 |ode emer|ge-A-buf|
|00005840| 66 65 72 20 62 75 66 66 | 65 72 2d 42 20 65 6d 65 |fer buff|er-B eme|
|00005850| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 20 62 75 66 |rge-B-bu|ffer buf|
|00005860| 66 65 72 2d 61 6e 63 65 | 73 74 6f 72 20 65 6d 65 |fer-ance|stor eme|
|00005870| 72 67 65 2d 61 6e 63 65 | 73 74 6f 72 2d 62 75 66 |rge-ance|stor-buf|
|00005880| 66 65 72 20 65 6d 65 72 | 67 65 2d 6d 65 72 67 65 |fer emer|ge-merge|
|00005890| 2d 62 75 66 66 65 72 20 | 22 4f 75 74 70 75 74 20 |-buffer |"Output |
|000058a0| 74 6f 20 66 69 6c 65 3a | 20 22 20 22 4f 75 74 70 |to file:| " "Outp|
|000058b0| 75 74 20 74 6f 20 62 75 | 66 66 65 72 3a 20 22 20 |ut to bu|ffer: " |
|000058c0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 65 6d 65 72 |buffer-n|ame emer|
|000058d0| 67 65 2d 6f 75 74 70 75 | 74 2d 64 65 73 63 72 69 |ge-outpu|t-descri|
|000058e0| 70 74 69 6f 6e 20 69 6e | 73 65 72 74 2d 62 75 66 |ption in|sert-buf|
|000058f0| 66 65 72 20 65 6d 65 72 | 67 65 2d 73 65 74 2d 6b |fer emer|ge-set-k|
|00005900| 65 79 73 20 65 6d 65 72 | 67 65 2d 6d 61 6b 65 2d |eys emer|ge-make-|
|00005910| 64 69 66 66 33 2d 6c 69 | 73 74 20 65 6d 65 72 67 |diff3-li|st emerg|
|00005920| 65 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |e-differ|ence-lis|
|00005930| 74 20 65 6d 65 72 67 65 | 2d 6e 75 6d 62 65 72 2d |t emerge|-number-|
|00005940| 6f 66 2d 64 69 66 66 65 | 72 65 6e 63 65 73 20 2d |of-diffe|rences -|
|00005950| 31 20 65 6d 65 72 67 65 | 2d 63 75 72 72 65 6e 74 |1 emerge|-current|
|00005960| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 71 75 69 74 |-differe|nce quit|
|00005970| 2d 68 6f 6f 6b 73 20 65 | 6d 65 72 67 65 2d 71 75 |-hooks e|merge-qu|
|00005980| 69 74 2d 68 6f 6f 6b 20 | 65 6d 65 72 67 65 2d 72 |it-hook |emerge-r|
|00005990| 65 6d 65 6d 62 65 72 2d | 62 75 66 66 65 72 2d 63 |emember-|buffer-c|
|000059a0| 68 61 72 61 63 74 65 72 | 69 73 74 69 63 73 20 65 |haracter|istics e|
|000059b0| 6d 65 72 67 65 2d 73 65 | 6c 65 63 74 2d 70 72 65 |merge-se|lect-pre|
|000059c0| 66 65 72 2d 42 73 20 65 | 6d 65 72 67 65 2d 68 61 |fer-Bs e|merge-ha|
|000059d0| 6e 64 6c 65 2d 6c 6f 63 | 61 6c 2d 76 61 72 69 61 |ndle-loc|al-varia|
|000059e0| 62 6c 65 73 20 65 6d 65 | 72 67 65 2d 73 65 74 75 |bles eme|rge-setu|
|000059f0| 70 2d 77 69 6e 64 6f 77 | 73 20 28 28 73 65 74 2d |p-window|s ((set-|
|00005a00| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005a10| 65 72 29 29 20 72 75 6e | 2d 68 6f 6f 6b 73 20 73 |er)) run|-hooks s|
|00005a20| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 6d 65 |tartup-h|ooks eme|
|00005a30| 72 67 65 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |rge-star|tup-hook|
|00005a40| 5d 20 36 5d 20 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |] 6] eme|rge-make|
|00005a50| 2d 64 69 66 66 33 2d 6c | 69 73 74 20 23 5b 28 66 |-diff3-l|ist #[(f|
|00005a60| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00005a70| 65 2d 61 6e 63 65 73 74 | 6f 72 29 20 22 c0 c1 21 |e-ancest|or) "..!|
|00005a80| 12 70 1b c4 8e 5c 6e 71 | 88 c5 20 88 c6 c7 c8 0e |.p...\nq|.. .....|
|00005a90| 09 0e 5c 6e cb 0e 5c 66 | 21 cb 0e 0d 21 cb 0e 0e |..\n..\f|!...!...|
|00005aa0| 21 26 06 cf 5c 22 88 2a | d0 0e 11 21 88 d2 0e 13 |!&..\".*|...!....|
|00005ab0| 0e 14 0e 15 d6 5c 6e 21 | 24 87 22 20 5b 67 65 74 |.....\n!|$." [get|
|00005ac0| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 22 |-buffer-|create "|
|00005ad0| 2a 65 6d 65 72 67 65 2d | 64 69 66 66 2a 22 20 65 |*emerge-|diff*" e|
|00005ae0| 6d 65 72 67 65 2d 64 69 | 66 66 2d 62 75 66 66 65 |merge-di|ff-buffe|
|00005af0| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 20 28 28 |r StartB|uffer ((|
|00005b00| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00005b10| 42 75 66 66 65 72 29 29 | 20 65 72 61 73 65 2d 62 |Buffer))| erase-b|
|00005b20| 75 66 66 65 72 20 73 68 | 65 6c 6c 2d 63 6f 6d 6d |uffer sh|ell-comm|
|00005b30| 61 6e 64 20 66 6f 72 6d | 61 74 20 22 25 73 20 25 |and form|at "%s %|
|00005b40| 73 20 25 73 20 25 73 20 | 25 73 22 20 65 6d 65 72 |s %s %s |%s" emer|
|00005b50| 67 65 2d 64 69 66 66 33 | 2d 70 72 6f 67 72 61 6d |ge-diff3|-program|
|00005b60| 20 65 6d 65 72 67 65 2d | 64 69 66 66 2d 6f 70 74 | emerge-|diff-opt|
|00005b70| 69 6f 6e 73 20 65 6d 65 | 72 67 65 2d 70 72 6f 74 |ions eme|rge-prot|
|00005b80| 65 63 74 2d 6d 65 74 61 | 63 68 61 72 73 20 66 69 |ect-meta|chars fi|
|00005b90| 6c 65 2d 41 20 66 69 6c | 65 2d 61 6e 63 65 73 74 |le-A fil|e-ancest|
|00005ba0| 6f 72 20 66 69 6c 65 2d | 42 20 74 20 65 6d 65 72 |or file-|B t emer|
|00005bb0| 67 65 2d 70 72 65 70 61 | 72 65 2d 65 72 72 6f 72 |ge-prepa|re-error|
|00005bc0| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 64 69 66 |-list em|erge-dif|
|00005bd0| 66 33 2d 6f 6b 2d 6c 69 | 6e 65 73 2d 72 65 67 65 |f3-ok-li|nes-rege|
|00005be0| 78 70 20 65 6d 65 72 67 | 65 2d 63 6f 6e 76 65 72 |xp emerg|e-conver|
|00005bf0| 74 2d 64 69 66 66 73 2d | 74 6f 2d 6d 61 72 6b 65 |t-diffs-|to-marke|
|00005c00| 72 73 20 65 6d 65 72 67 | 65 2d 41 2d 62 75 66 66 |rs emerg|e-A-buff|
|00005c10| 65 72 20 65 6d 65 72 67 | 65 2d 42 2d 62 75 66 66 |er emerg|e-B-buff|
|00005c20| 65 72 20 65 6d 65 72 67 | 65 2d 6d 65 72 67 65 2d |er emerg|e-merge-|
|00005c30| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 65 78 |buffer e|merge-ex|
|00005c40| 74 72 61 63 74 2d 64 69 | 66 66 73 33 5d 20 39 5d |tract-di|ffs3] 9]|
|00005c50| 20 65 6d 65 72 67 65 2d | 65 78 74 72 61 63 74 2d | emerge-|extract-|
|00005c60| 64 69 66 66 73 33 20 23 | 5b 28 64 69 66 66 2d 62 |diffs3 #|[(diff-b|
|00005c70| 75 66 66 65 72 29 20 22 | c0 19 70 1a c3 8e 5c 66 |uffer) "|..p...\f|
|00005c80| 71 88 c5 c6 c0 c7 23 83 | 6a 00 c8 79 88 c8 94 c8 |q.....#.|j..y....|
|00005c90| 95 7b 89 1e 09 ca 98 84 | 66 00 c0 89 89 1e 0b 1e |.{......|f.......|
|00005ca0| 5c 66 1e 0d 60 16 0b ce | cf 21 16 0d 0e 0b 62 88 |\f..`...|.!....b.|
|00005cb0| ce d0 21 16 5c 66 d1 0e | 0d 40 0e 0d 41 40 0e 5c |..!.\f..|.@..A@.\|
|00005cc0| 66 40 0e 5c 66 41 40 0e | 09 cf 98 83 55 00 d2 82 |f@.\fA@.|....U...|
|00005cd0| 61 00 0e 09 d0 98 83 60 | 00 d3 82 61 00 d4 25 2b |a......`|...a..%+|
|00005ce0| 09 42 11 29 82 09 00 2a | 09 9f 29 87 22 20 5b 6e |.B.)...*|..)." [n|
|00005cf0| 69 6c 20 6c 69 73 74 20 | 53 74 61 72 74 42 75 66 |il list |StartBuf|
|00005d00| 66 65 72 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |fer ((se|t-buffer|
|00005d10| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 64 | StartBu|ffer)) d|
|00005d20| 69 66 66 2d 62 75 66 66 | 65 72 20 72 65 2d 73 65 |iff-buff|er re-se|
|00005d30| 61 72 63 68 2d 66 6f 72 | 77 61 72 64 20 22 5e 3d |arch-for|ward "^=|
|00005d40| 3d 3d 3d 5c 5c 28 2e 3f | 5c 5c 29 24 22 20 74 20 |===\\(.?|\\)$" t |
|00005d50| 31 20 61 67 72 65 65 6d | 65 6e 74 20 22 32 22 20 |1 agreem|ent "2" |
|00005d60| 70 6f 73 20 67 72 6f 75 | 70 2d 33 20 67 72 6f 75 |pos grou|p-3 grou|
|00005d70| 70 2d 31 20 65 6d 65 72 | 67 65 2d 67 65 74 2d 64 |p-1 emer|ge-get-d|
|00005d80| 69 66 66 33 2d 67 72 6f | 75 70 20 22 31 22 20 22 |iff3-gro|up "1" "|
|00005d90| 33 22 20 76 65 63 74 6f | 72 20 70 72 65 66 65 72 |3" vecto|r prefer|
|00005da0| 2d 41 20 70 72 65 66 65 | 72 2d 42 20 64 65 66 61 |-A prefe|r-B defa|
|00005db0| 75 6c 74 2d 41 5d 20 38 | 5d 20 65 6d 65 72 67 65 |ult-A] 8|] emerge|
|00005dc0| 2d 67 65 74 2d 64 69 66 | 66 33 2d 67 72 6f 75 70 |-get-dif|f3-group|
|00005dd0| 20 23 5b 28 66 69 6c 65 | 29 20 22 8a c0 c1 5c 6e | #[(file|) "...\n|
|00005de0| c3 51 21 88 c4 79 88 c5 | 94 c5 95 7b c6 98 83 3e |.Q!..y..|...{...>|
|00005df0| 00 c7 94 83 2d 00 c8 c4 | 94 c4 95 7b 21 c8 c9 94 |....-...|...{!...|
|00005e00| c9 95 7b 21 54 44 82 48 | 00 c8 c4 94 c4 95 7b 21 |..{!TD.H|......{!|
|00005e10| 89 1e 5c 6e 89 54 29 44 | 82 48 00 c8 c4 94 c4 95 |..\n.T)D|.H......|
|00005e20| 7b 21 54 89 44 29 87 22 | 20 5b 72 65 2d 73 65 61 |{!T.D)."| [re-sea|
|00005e30| 72 63 68 2d 66 6f 72 77 | 61 72 64 20 22 5e 22 20 |rch-forw|ard "^" |
|00005e40| 66 69 6c 65 20 22 3a 5c | 5c 28 5b 30 2d 39 5d 2b |file ":\|\([0-9]+|
|00005e50| 5c 5c 29 5c 5c 28 2c 5c | 5c 28 5b 30 2d 39 5d 2b |\\)\\(,\|\([0-9]+|
|00005e60| 5c 5c 29 5c 5c 29 3f 5c | 5c 28 5b 61 63 5d 5c 5c |\\)\\)?\|\([ac]\\|
|00005e70| 29 24 22 20 31 20 34 20 | 22 63 22 20 32 20 73 74 |)$" 1 4 |"c" 2 st|
|00005e80| 72 69 6e 67 2d 74 6f 2d | 69 6e 74 20 33 20 78 5d |ring-to-|int 3 x]|
|00005e90| 20 35 5d 5d 20 34 29 0a | 28 64 65 66 61 6c 69 61 | 5]] 4).|(defalia|
|00005ea0| 73 20 27 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 20 |s 'emerg|e-files |
|00005eb0| 23 5b 28 61 72 67 20 66 | 69 6c 65 2d 41 20 66 69 |#[(arg f|ile-A fi|
|00005ec0| 6c 65 2d 42 20 66 69 6c | 65 2d 6f 75 74 20 26 6f |le-B fil|e-out &o|
|00005ed0| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|00005ee0| 68 6f 6f 6b 73 20 71 75 | 69 74 2d 68 6f 6f 6b 73 |hooks qu|it-hooks|
|00005ef0| 29 20 22 c0 09 5c 6e 0b | 5c 66 83 14 00 c5 c6 c7 |) "..\n.|\f......|
|00005f00| 5c 66 44 45 0e 08 42 82 | 16 00 0e 08 5c 66 25 87 |\fDE..B.|....\f%.|
|00005f10| 22 20 5b 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |" [emerg|e-files-|
|00005f20| 69 6e 74 65 72 6e 61 6c | 20 66 69 6c 65 2d 41 20 |internal| file-A |
|00005f30| 66 69 6c 65 2d 42 20 73 | 74 61 72 74 75 70 2d 68 |file-B s|tartup-h|
|00005f40| 6f 6f 6b 73 20 66 69 6c | 65 2d 6f 75 74 20 6c 61 |ooks fil|e-out la|
|00005f50| 6d 62 64 61 20 6e 69 6c | 20 65 6d 65 72 67 65 2d |mbda nil| emerge-|
|00005f60| 66 69 6c 65 73 2d 65 78 | 69 74 20 71 75 69 74 2d |files-ex|it quit-|
|00005f70| 68 6f 6f 6b 73 5d 20 38 | 20 22 5c 0a 52 75 6e 20 |hooks] 8| "\.Run |
|00005f80| 45 6d 65 72 67 65 20 6f | 6e 20 74 77 6f 20 66 69 |Emerge o|n two fi|
|00005f90| 6c 65 73 2e 22 20 28 62 | 79 74 65 2d 63 6f 64 65 |les." (b|yte-code|
|00005fa0| 20 22 c0 19 5c 6e c3 c4 | 0d c0 89 24 89 11 c3 c6 | "..\n..|...$....|
|00005fb0| 0e 07 c0 09 24 5c 6e 85 | 1d 00 c3 c8 0e 09 09 89 |....$\n.|........|
|00005fc0| 24 46 29 87 22 20 5b 6e | 69 6c 20 66 20 63 75 72 |$F)." [n|il f cur|
|00005fd0| 72 65 6e 74 2d 70 72 65 | 66 69 78 2d 61 72 67 20 |rent-pre|fix-arg |
|00005fe0| 65 6d 65 72 67 65 2d 72 | 65 61 64 2d 66 69 6c 65 |emerge-r|ead-file|
|00005ff0| 2d 6e 61 6d 65 20 22 46 | 69 6c 65 20 41 20 74 6f |-name "F|ile A to|
|00006000| 20 6d 65 72 67 65 22 20 | 65 6d 65 72 67 65 2d 6c | merge" |emerge-l|
|00006010| 61 73 74 2d 64 69 72 2d | 41 20 22 46 69 6c 65 20 |ast-dir-|A "File |
|00006020| 42 20 74 6f 20 6d 65 72 | 67 65 22 20 65 6d 65 72 |B to mer|ge" emer|
|00006030| 67 65 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 22 4f |ge-last-|dir-B "O|
|00006040| 75 74 70 75 74 20 66 69 | 6c 65 22 20 65 6d 65 72 |utput fi|le" emer|
|00006050| 67 65 2d 6c 61 73 74 2d | 64 69 72 2d 6f 75 74 70 |ge-last-|dir-outp|
|00006060| 75 74 5d 20 38 29 5d 29 | 0a 28 64 65 66 61 6c 69 |ut] 8)])|.(defali|
|00006070| 61 73 20 27 65 6d 65 72 | 67 65 2d 66 69 6c 65 73 |as 'emer|ge-files|
|00006080| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 23 |-with-an|cestor #|
|00006090| 5b 28 61 72 67 20 66 69 | 6c 65 2d 41 20 66 69 6c |[(arg fi|le-A fil|
|000060a0| 65 2d 42 20 66 69 6c 65 | 2d 61 6e 63 65 73 74 6f |e-B file|-ancesto|
|000060b0| 72 20 66 69 6c 65 2d 6f | 75 74 20 26 6f 70 74 69 |r file-o|ut &opti|
|000060c0| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|000060d0| 6b 73 20 71 75 69 74 2d | 68 6f 6f 6b 73 29 20 22 |ks quit-|hooks) "|
|000060e0| c0 09 5c 6e 0b 5c 66 0d | 83 15 00 c6 c7 c8 0d 44 |..\n.\f.|.......D|
|000060f0| 45 0e 09 42 82 17 00 0e | 09 0d 26 06 87 22 20 5b |E..B....|..&.." [|
|00006100| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|00006110| 68 2d 61 6e 63 65 73 74 | 6f 72 2d 69 6e 74 65 72 |h-ancest|or-inter|
|00006120| 6e 61 6c 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |nal file|-A file-|
|00006130| 42 20 66 69 6c 65 2d 61 | 6e 63 65 73 74 6f 72 20 |B file-a|ncestor |
|00006140| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 66 69 |startup-|hooks fi|
|00006150| 6c 65 2d 6f 75 74 20 6c | 61 6d 62 64 61 20 6e 69 |le-out l|ambda ni|
|00006160| 6c 20 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 65 |l emerge|-files-e|
|00006170| 78 69 74 20 71 75 69 74 | 2d 68 6f 6f 6b 73 5d 20 |xit quit|-hooks] |
|00006180| 39 20 22 5c 0a 52 75 6e | 20 45 6d 65 72 67 65 20 |9 "\.Run| Emerge |
|00006190| 6f 6e 20 74 77 6f 20 66 | 69 6c 65 73 2c 20 67 69 |on two f|iles, gi|
|000061a0| 76 69 6e 67 20 61 6e 6f | 74 68 65 72 20 66 69 6c |ving ano|ther fil|
|000061b0| 65 20 61 73 20 74 68 65 | 20 61 6e 63 65 73 74 6f |e as the| ancesto|
|000061c0| 72 2e 22 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |r." (byt|e-code "|
|000061d0| c0 19 5c 6e c3 c4 0d c0 | 89 24 89 11 c3 c6 0e 07 |..\n....|.$......|
|000061e0| c0 09 24 c3 c8 0e 09 c0 | 09 24 5c 6e 85 24 00 c3 |..$.....|.$\n.$..|
|000061f0| ca 0e 0b 09 89 24 af 05 | 29 87 22 20 5b 6e 69 6c |.....$..|)." [nil|
|00006200| 20 66 20 63 75 72 72 65 | 6e 74 2d 70 72 65 66 69 | f curre|nt-prefi|
|00006210| 78 2d 61 72 67 20 65 6d | 65 72 67 65 2d 72 65 61 |x-arg em|erge-rea|
|00006220| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 22 46 69 6c |d-file-n|ame "Fil|
|00006230| 65 20 41 20 74 6f 20 6d | 65 72 67 65 22 20 65 6d |e A to m|erge" em|
|00006240| 65 72 67 65 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |erge-las|t-dir-A |
|00006250| 22 46 69 6c 65 20 42 20 | 74 6f 20 6d 65 72 67 65 |"File B |to merge|
|00006260| 22 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |" emerge|-last-di|
|00006270| 72 2d 42 20 22 41 6e 63 | 65 73 74 6f 72 20 66 69 |r-B "Anc|estor fi|
|00006280| 6c 65 22 20 65 6d 65 72 | 67 65 2d 6c 61 73 74 2d |le" emer|ge-last-|
|00006290| 64 69 72 2d 61 6e 63 65 | 73 74 6f 72 20 22 4f 75 |dir-ance|stor "Ou|
|000062a0| 74 70 75 74 20 66 69 6c | 65 22 20 65 6d 65 72 67 |tput fil|e" emerg|
|000062b0| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 6f 75 74 70 75 |e-last-d|ir-outpu|
|000062c0| 74 5d 20 39 29 5d 29 0a | 28 64 65 66 61 6c 69 61 |t] 9)]).|(defalia|
|000062d0| 73 20 28 71 75 6f 74 65 | 20 65 6d 65 72 67 65 2d |s (quote| emerge-|
|000062e0| 66 69 6c 65 73 2d 65 78 | 69 74 29 20 23 5b 28 66 |files-ex|it) #[(f|
|000062f0| 69 6c 65 2d 6f 75 74 29 | 20 22 08 3f 85 08 00 c1 |ile-out)| ".?....|
|00006300| 5c 6e 21 87 22 20 5b 65 | 6d 65 72 67 65 2d 70 72 |\n!." [e|merge-pr|
|00006310| 65 66 69 78 2d 61 72 67 | 75 6d 65 6e 74 20 65 6d |efix-arg|ument em|
|00006320| 65 72 67 65 2d 77 72 69 | 74 65 2d 61 6e 64 2d 64 |erge-wri|te-and-d|
|00006330| 65 6c 65 74 65 20 66 69 | 6c 65 2d 6f 75 74 5d 20 |elete fi|le-out] |
|00006340| 32 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |2]).(def|alias 'e|
|00006350| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 23 5b |merge-bu|ffers #[|
|00006360| 28 62 75 66 66 65 72 2d | 41 20 62 75 66 66 65 72 |(buffer-|A buffer|
|00006370| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|00006380| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|00006390| 68 6f 6f 6b 73 29 20 22 | c0 c1 21 c0 c2 21 1b 1c |hooks) "|..!..!..|
|000063a0| 70 1d c6 8e 0e 07 71 88 | c8 65 64 5c 66 c9 ca 25 |p.....q.|.ed\f..%|
|000063b0| 88 2a 70 1d cb 8e 0e 5c | 66 71 88 c8 65 64 0b c9 |.*p....\|fq..ed..|
|000063c0| ca 25 88 2a cd ce 0e 07 | 21 5c 66 ce 0e 5c 66 21 |.%.*....|!\f..\f!|
|000063d0| 0b cf c9 d0 5c 66 44 d0 | 0b 44 46 0e 11 42 0e 12 |....\fD.|.DF..B..|
|000063e0| c9 26 07 2a 87 22 20 5b | 65 6d 65 72 67 65 2d 6d |.&.*." [|emerge-m|
|000063f0| 61 6b 65 2d 74 65 6d 70 | 2d 66 69 6c 65 20 22 41 |ake-temp|-file "A|
+--------+-------------------------+-------------------------+--------+--------+